upd

application/models/Business/Order/RefundService.php

@@ -76,6 +76,33 @@ class RefundServiceModel extends \Business\AbstractModel
         return $max_data[$day_type];
     }
 
+    /**
+     * 修改收货时间
+     * @param $storeId
+     * @param $refundId
+     * @param $receiveTime
+     */
+    public function setReceiveTime($storeId, $refundId, $receiveTime) {
+        $dtime = strtotime($receiveTime);
+        if($receiveTime<TIMESTAMP){
+            ErrorModel::throwException(CodeConfigModel::commonError);
+        }
+        $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::masterDBConnectName);
+        $whereRefund  = array();
+        $whereRefund['store_id']= $storeId;
+        $whereRefund['refund_id']= $refundId;
+        $refund = $refundReturnDao->find($whereRefund);
+
+        if(!$refund) {  //未知的退款信息
+            ErrorModel::throwException(CodeConfigModel::notExistRefund);
+        }
+        $state = $refundReturnDao->update(array('refund_id'=> $refundId), array('receive_time'=> $receiveTime));
+        if(!$state){
+            return false;
+        }
+        return true;
+    }
+
     /**
      * 退货收货处理
      * @param $storeId
@@ -214,6 +241,11 @@ class RefundServiceModel extends \Business\AbstractModel
             $refundReturnDao->db->doCommit();
             return true;
         }
+        if($refundAmount > $refund['buyer_refund_amount']){
+            //showDialog('退款金额不可大于本订单支付金额','','error');
+            $refundReturnDao->db->doRollback();
+            return false;
+        }
         //以下为同意退款流程
         if($order_info['order_state']==40){ //交易完成订单，退积分
             $res = $this->edit_points($refund, $order_info);

application/modules/Client/controllers/Shopkeeper.php

@@ -298,6 +298,21 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
         $version = \Business\Common\SettingServiceModel::getInstance()->getAppVersion();
         $this->success($version);
     }
+
+    /**
+     * 设置收货时间
+     * @throws Exception
+     */
+    public function setReceiveTimeAction(){
+        $refundId= intval($this->req['data']['refundId']);
+        if(!$refundId) {
+            ErrorModel::throwException(CodeConfigModel::notExistRefund);
+        }
+        $refundService=\Business\Order\RefundServiceModel::getInstance();
+        $receiveTime = trim($this->req['data']['receiveTime']);
+        $res = $refundService->setReceiveTime($this->storeId, $refundId, $receiveTime);
+        $this->success($res);
+    }
 }