storage

application/models/Business/Goods/GoodsCommonService.php

@@ -27,6 +27,30 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
      * @throws \Exception
      */
     public function setGoodsStorage($storeId, $goodsId, $num = 0, $type='add') {
+        $orderService=\Business\Order\OrderServiceModel::getInstance();
+        if($goodsId === 0){
+            \Error\ErrorModel::throwException(\Error\CodeConfigModel::commonError);
+        }
+        if($type=='add'){
+            $type=ApiConst::plus;
+
+        }else{
+            $type=ApiConst::set;
+        }
+        $res=$orderService->updateGoodsStoregeByGoodsIds($storeId,$goodsId,$num,$type);
+        return $res;
+    }
+
+    /**
+     * 设置库存
+     * @param $storeId
+     * @param $goodsId
+     * @param int $num
+     * @param string $type
+     * @return array
+     * @throws \Exception
+     */
+    public function setGoodsStorageBak($storeId, $goodsId, $num = 0, $type='add') {
         if($goodsId === 0){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::commonError);
         }

application/models/Business/Order/OrderService.php

@@ -775,23 +775,8 @@ class OrderServiceModel extends \Business\AbstractModel
         }
         file_put_contents($this->baseDir . \Our\PathConst::orderCloseWaitRecieveOrder, $endTime);
     }
-
-    public function updateOrderGoodsStoregeByOrderIds($orderIds,$orderGoodsId=false){
-        $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
+    public function updateDateGoodsStoregeByOrderGoods($orderGoods,$type=ApiConst::plus){
         $orderConfirmUtilDao=OrderConfirmUtil::getInstance(DbNameConst::masterDBConnectName);
-        //更新商品库存
-        $orderGoodses = $orderGoodsDao->getOrderGoodsByOrderIds($orderIds, $this->getGoodsDetailField());
-        $orderGoods=array();
-        if(!empty($orderGoodsId)){
-            foreach($orderGoodses as $orderGood){
-                    if($orderGood['recId']==$orderGoodsId){
-                        array_push($orderGoods,$orderGood);
-                    }
-            }
-        }
-        if(empty($orderGoods)){
-            $orderGoods=$orderGoodses;
-        }
         $storeCartsList=array();
         $storeCarts=array();
         $storeCarts['storeCarts']=array();
@@ -806,12 +791,49 @@ class OrderServiceModel extends \Business\AbstractModel
         }
         // $orderDao->updateNotRecieveOrders(ApiConst::orderStateWaitConfirm, ApiConst::orderStateClose, 'add_time', ApiConst::orderStateWaitConfirmBeyond, $this->orderMessageField);
         try{
-            $orderConfirmUtilDao->updateGoodsStorage($storeCartsList,\Our\ApiConst::plus);
+            $orderConfirmUtilDao->updateGoodsStorage($storeCartsList,$type);
+            return true;
         }catch(\Exception $ex){
-            $orderidsStr=implode(',',$orderIds);
+            $orderGoodsIds=array_column($orderGoods,'goodsId');
+            $orderidsStr=implode(',',$orderGoodsIds);
             echo '商品库存更新失败:'.$ex->getMessage().$ex->getCode().":".$orderidsStr;
         }
     }
+    public function updateOrderGoodsStoregeByOrderIds($orderIds,$orderGoodsId=false){
+        $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
+
+        //更新商品库存
+        $orderGoodses = $orderGoodsDao->getOrderGoodsByOrderIds($orderIds, $this->getGoodsDetailField());
+        $orderGoods=array();
+        if(!empty($orderGoodsId)){
+            foreach($orderGoodses as $orderGood){
+                    if($orderGood['recId']==$orderGoodsId){
+                        array_push($orderGoods,$orderGood);
+                    }
+            }
+        }
+        if(empty($orderGoods)){
+            $orderGoods=$orderGoodses;
+        }
+        $this->updateDateGoodsStoregeByOrderGoods($orderGoods);
+
+    }
+
+    public function updateGoodsStoregeByGoodsIds($storeId,$goodsid,$num=ApiConst::zero,$type=ApiConst::plus){
+        $where['goods_id']=$goodsid;
+        $where['store_id']=$storeId;
+        $goodsDao = \DAO\GoodsModel::getInstance(DbNameConst::masterDBConnectName);
+        $goodses=$goodsDao->getList($where,$goodsDao->goodsDetailField);
+        if(!empty($goodses)){
+            foreach($goodses as &$goods){
+                    $goods['goodsNum']=$num;
+            }
+            if($this->updateDateGoodsStoregeByOrderGoods($goodses,$type)){
+                return true;
+            }
+        }
+        return false;
+    }
 
     //订单任务脚本自动确认收货
     public function canformRecieveOrder()

application/models/Business/Order/RefundService.php

@@ -187,7 +187,7 @@ class RefundServiceModel extends \Business\AbstractModel
             $orderDao->deleteOrderCache($refund['buyer_id'], $refund['order_id'], $refund['store_id']);
             $storeDAO->deleteStoreRefundCache($refund['store_id'],$refund['order_id']);
             $orderService=\Business\Order\OrderServiceModel::getInstance();
-            $orderService->updateOrderGoodsStoregeByOrderIds($refund['order_id']);
+            $orderService->updateOrderGoodsStoregeByOrderIds($refund['order_id'],$refund['goods_id']);
             $refundReturnDao->db->doCommit();
             $push=\Our\Push::getInstance();
             $pushData=array('storeId'=>$storeId,

application/models/DAO/Goods.php

@@ -20,7 +20,7 @@ class GoodsModel extends \DAO\AbstractModel {
 
     private $cartGoodsField = 'goods_id,goods_storage,store_id,goods_commonid,goods_name,goods_image,goods_spec,snapshot_id';
 
-    public $goodsDetailField='goods_id as goodsId,goods_commonid as goodsCommonid,goods_name as goodsName,store_id as storeId';
+    public $goodsDetailField='goods_id as goodsId,goods_commonid as goodsCommonid,goods_commonid as goodsCommonId,goods_name as goodsName,store_id as storeId';
 
     /**
      * 主键

public/test.html

@@ -17,6 +17,9 @@
     <script src="//static.shenbd.com/lib/m/js/swiper-3.4.1.jquery.min.js"></script>
 </head>
 <body class="page-index">
+<form>
+    <input name="data[image][]" />
+</form>
 <div class="wrap">
     <h1 class="logo"><a href="#"><img src="//static.shenbd.com/lib/img/logo.png" alt=""></a></h1>
     <section class="pn-download">