pc

application/library/Our/ApiConst.php

@@ -201,6 +201,7 @@ class ApiConst
 
     //配送表deliveryState
     //当购买的时候是待送货，当退货的时候是待收货
+    const deliveryStateWaitTen = 10;
     const deliveryStateWait = 20;
     const deliveryStateComplete = 30;
 

application/models/DAO/Order/QmDeliverymanLog.php

@@ -3,6 +3,7 @@
 namespace DAO\Order;
 
 use Our\ApiConst;
+use Our\Common;
 use Our\DbNameConst;
 use Our\ImageConst;
 
@@ -93,8 +94,9 @@ class QmDeliverymanLogModel extends \DAO\AbstractModel
             $where['delivery_state'] = ApiConst::deliveryStateWait;
         }
         if ($type == ApiConst::orderTypeRefund) {
-            $where['order_type'] = ApiConst::orderTypeRefund;
-            $where['delivery_state'] = ApiConst::deliveryStateWait;
+            $where=Common::format(" order_type={0} and (delivery_state={1} or delivery_state={2}",ApiConst::orderTypeRefund,ApiConst::deliveryStateWait,ApiConst::deliveryStateWaitTen);
+//            $where['order_type'] = ApiConst::orderTypeRefund;
+//            $where['delivery_state'] = ApiConst::deliveryStateWait;
         }
         if ($type == ApiConst::deliveryStateWait) {
             $where['delivery_state'] = ApiConst::deliveryStateComplete;