pc

application/models/Business/Store/DeliveryService.php

@@ -33,11 +33,19 @@ class DeliveryServiceModel extends \Business\AbstractModel
     {
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
         $storeDao=\DAO\StoreModel::getInstance();
+        $refundReturnDao=\DAO\Order\RefundReturnModel::getInstance(DbNameConst::masterDBConnectName);
         $qmDeliveryManLog = \DAO\Order\QmDeliverymanLogModel::getInstance(DbNameConst::masterDBConnectName);
         $messageService=\Business\Message\MessageServiceModel::getInstance();
         $deliveryManDao=\DAO\Order\DiliverymanModel::getInstance();
         $orderDao->setDb($orderDao->dbName);
-        $orderD= $orderDao->find($data['orderId'],$orderDao->getOrderDetailField());
+        if($data['orderType']==ApiConst::orderTypeRefund){
+            //如果是退货orderId就是refundId
+            $orderOne=  $refundReturnDao->findByRefundId($data['orderId'],$refundReturnDao->refundDetailField);
+            $orderD= $orderDao->find($orderOne['orderId'],$orderDao->getOrderDetailField());
+        }else{
+            $orderD= $orderDao->find($data['orderId'],$orderDao->getOrderDetailField());
+        }
+
 //        if( $orderD['diliveryman_id']== $data['id']){
 //            ErrorModel::throwException(CodeConfigModel::alreadyExsitQmDeliveryLog);
 //        }
@@ -46,12 +54,18 @@ class DeliveryServiceModel extends \Business\AbstractModel
 //        }
         $orderDao->db->doTransaction();
         $orderData['diliveryman_id'] = $data['id'];
-        $orderData['order_state']=ApiConst::orderStateWaitRecieve;
-        $orderRes = $orderDao->updateByOrderId($orderData, $data['orderId']);
-//        if (!$orderRes) {
-//            $orderDao->db->doRollback();
-//            ErrorModel::throwException(CodeConfigModel::updateOrderFail);
-//        }
+        if($data['orderType']==ApiConst::orderTypeRefund){
+            $returnWhere['refund_id']=$data['orderId'];
+            $orderRes= $refundReturnDao->update($returnWhere,$orderData);
+        }else{
+            $orderData['order_state']=ApiConst::orderStateWaitRecieve;
+            $orderRes = $orderDao->updateByOrderId($orderData, $data['orderId']);
+        }
+
+        if ($orderRes!==false) {
+            $orderDao->db->doRollback();
+            ErrorModel::throwException(CodeConfigModel::updateOrderFail);
+        }
         $qmDeliveryManLogData['diliveryman_id'] = $data['id'];
         $qmDeliveryManLogData['store_id'] = $data['storeId'];
         $qmDeliveryManLogData['order_id'] = $data['orderId'];