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,27 +767,7 @@ class OrderServiceModel extends \Business\AbstractModel
             }
 
             $orderIds = array_column($orders, 'orderId');
-            //更新商品库存
-            $orderGoods = $orderGoodsDao->getOrderGoodsByOrderIds($orderIds, $this->getGoodsDetailField());
-            $storeCartsList=array();
-            $storeCarts=array();
-            $storeCarts['storeCarts']=array();
-            foreach($orderGoods as $orderGood){
-                $orderGood['type']=!empty($orderGood['goodsGroup'])? \Our\ApiConst::addBundingToCart:\Our\ApiConst::addGoodsToCart;
-                $orderGood['goodsNum']=$orderGood['goodsNum'];
-                $orderGood['goodsList']=\Our\Common::isSerialized($orderGood['goodsGroup'])?unserialize($orderGood['goodsGroup']):array();
-                array_push($storeCarts['storeCarts'],$orderGood);
-            }
-            if(!empty($storeCarts['storeCarts'])){
-                array_push($storeCartsList,$storeCarts);
-            }
-            // $orderDao->updateNotRecieveOrders(ApiConst::orderStateWaitConfirm, ApiConst::orderStateClose, 'add_time', ApiConst::orderStateWaitConfirmBeyond, $this->orderMessageField);
-            try{
-                $orderConfirmUtilDao->updateGoodsStorage($storeCartsList,\Our\ApiConst::plus);
-            }catch(\Exception $ex){
-                $orderidsStr=implode(',',array_column($orders,'orderId'));
-                echo '商品库存更新失败:'.$ex->getMessage().$ex->getCode().":".$orderidsStr;
-            }
+            $this->updateOrderGoodsStoregeByOrderIds($orderIds);
             //发送消息
             $push = Push::getInstance();
             $push->pushOrderCloseMessage($orders);
@@ -798,6 +776,32 @@ class OrderServiceModel extends \Business\AbstractModel
         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();
+        $storeCarts=array();
+        $storeCarts['storeCarts']=array();
+        foreach($orderGoods as $orderGood){
+            $orderGood['type']=!empty($orderGood['goodsGroup'])? \Our\ApiConst::addBundingToCart:\Our\ApiConst::addGoodsToCart;
+            $orderGood['goodsNum']=$orderGood['goodsNum'];
+            $orderGood['goodsList']=\Our\Common::isSerialized($orderGood['goodsGroup'])?unserialize($orderGood['goodsGroup']):array();
+            array_push($storeCarts['storeCarts'],$orderGood);
+        }
+        if(!empty($storeCarts['storeCarts'])){
+            array_push($storeCartsList,$storeCarts);
+        }
+        // $orderDao->updateNotRecieveOrders(ApiConst::orderStateWaitConfirm, ApiConst::orderStateClose, 'add_time', ApiConst::orderStateWaitConfirmBeyond, $this->orderMessageField);
+        try{
+            $orderConfirmUtilDao->updateGoodsStorage($storeCartsList,\Our\ApiConst::plus);
+        }catch(\Exception $ex){
+            $orderidsStr=implode(',',$orderIds);
+            echo '商品库存更新失败:'.$ex->getMessage().$ex->getCode().":".$orderidsStr;
+        }
+    }
+
     //订单任务脚本自动确认收货
     public function canformRecieveOrder()
     {

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为已完成