dilivery

application/models/Business/Order/OrderService.php

@@ -713,8 +713,6 @@ class OrderServiceModel extends \Business\AbstractModel
     public function changeOrderStatus()
     {
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
-        $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
-        $orderConfirmUtilDao=OrderConfirmUtil::getInstance(DbNameConst::masterDBConnectName);
         $beginTime = file_get_contents($this->baseDir . \Our\PathConst::orderCloseWaitRecieveOrder, TIMESTAMP);
         $beginTime = $beginTime ? $beginTime : ApiConst::zero;
         $endTime = TIMESTAMP - ApiConst::orderStateWaitConfirmBeyond;
@@ -769,6 +767,18 @@ class OrderServiceModel extends \Business\AbstractModel
             }
 
             $orderIds = array_column($orders, 'orderId');
+            $this->updateOrderGoodsStoregeByOrderIds($orderIds);
+            //发送消息
+            $push = Push::getInstance();
+            $push->pushOrderCloseMessage($orders);
+
+        }
+        file_put_contents($this->baseDir . \Our\PathConst::orderCloseWaitRecieveOrder, $endTime);
+    }
+
+    public function updateOrderGoodsStoregeByOrderIds($orderIds){
+        $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
+        $orderConfirmUtilDao=OrderConfirmUtil::getInstance(DbNameConst::masterDBConnectName);
         //更新商品库存
         $orderGoods = $orderGoodsDao->getOrderGoodsByOrderIds($orderIds, $this->getGoodsDetailField());
         $storeCartsList=array();
@@ -787,15 +797,9 @@ class OrderServiceModel extends \Business\AbstractModel
         try{
             $orderConfirmUtilDao->updateGoodsStorage($storeCartsList,\Our\ApiConst::plus);
         }catch(\Exception $ex){
-                $orderidsStr=implode(',',array_column($orders,'orderId'));
+            $orderidsStr=implode(',',$orderIds);
             echo '商品库存更新失败:'.$ex->getMessage().$ex->getCode().":".$orderidsStr;
         }
-            //发送消息
-            $push = Push::getInstance();
-            $push->pushOrderCloseMessage($orders);
-
-        }
-        file_put_contents($this->baseDir . \Our\PathConst::orderCloseWaitRecieveOrder, $endTime);
     }
 
     //订单任务脚本自动确认收货

application/models/Business/Order/RefundService.php

@@ -286,6 +286,8 @@ class RefundServiceModel extends \Business\AbstractModel
             if ($refund_array['seller_state'] == '2' && !$isGiveUp) {
                 $refund_array['return_type'] = '2';//退货类型:1为不用退货,2为需要退货
                 $refund_array['goods_state']=2;
+                $orderService=\Business\Order\OrderServiceModel::getInstance();
+                $orderService->updateOrderGoodsStoregeByOrderIds($return['order_id']);
             } elseif ($refund_array['seller_state'] == '3') {
 
                 $refund_array['refund_state'] = '3';//状态:1为处理中,2为待管理员处理,3为已完成