pc

application/models/Business/Order/OrderService.php

@@ -485,27 +485,29 @@ class OrderServiceModel extends \Business\AbstractModel
         $orders = $orderDao->getMustCecelRecieveOrders($beginTime, $endTime, $orderDao->getOrderDetailField());
 
         if (!empty($orders)) {
-//            $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);
-//            }catch(\Exception $ex){
-//                throw new \Exception('商品库存更新失败:'.$ex->getMessage(),$ex->getCode());
-//            }
-//            exit;
+            $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;
+            }
+            echo 1;
+            exit;
 
                 foreach ($orders as $order) {
                     //更新订单信息

application/models/DAO/Goods.php

@@ -317,7 +317,8 @@ class GoodsModel extends \DAO\AbstractModel {
             $dataIds[] = $datas[$i]['goodsId'];
             $updateAllSql .= $updateSql;
             if ($i % 1000 == 0 && $i != 0) {
-                $updateAllSql .= \Our\Common::format('END where goods_id in ({0})',implode(',',$dataIds));
+                $updateAllSql = trim($updateAllSql,',');
+                $updateAllSql .= \Our\Common::format(' END where goods_id in ({0})',implode(',',$dataIds));
                 $one = $this->db->update($this->_tableName)->query($updateAllSql);
                 if (!$one) {
                     $error++;
@@ -327,7 +328,8 @@ class GoodsModel extends \DAO\AbstractModel {
             }
         }
         if ($updateAllSql != $baseSql) {
-            $updateAllSql .= \Our\Common::format('END where goods_id in ({0})',implode(',',$dataIds));
+            $updateAllSql = trim($updateAllSql,',');
+            $updateAllSql .= \Our\Common::format(' END where goods_id in ({0})',implode(',',$dataIds));
             $one = $this->db->update($this->_tableName)->query($updateAllSql);
             if (!$one) {
                 $error++;

application/models/DAO/GoodsCommon.php

@@ -208,20 +208,21 @@ class GoodsCommonModel extends \DAO\AbstractModel {
         $datas = array_values($dataList);
         $this->setDb(\Our\DbNameConst::masterDBConnectName);
         $error = 0;
-        $baseSql = "UPDATE {$this->_tableName} set goods_storage = case goods_commonid ";
+        $baseSql = "UPDATE {$this->_tableName} set ";
         $updateAllSql = $baseSql;
         $dataIds = array();
         if($updateSaleNumFlag&&$op!=\Our\ApiConst::set){
             $updateSaleNumOp = $op==\Our\ApiConst::minus?'+':'-';
         }
         for ($i = 0; $i < count($datas); $i++) {
-            $updateSql = \Our\Common::format(" WHEN {0} THEN goods_storage{1}{2} ", $datas[$i]['goodsCommonId'],\Our\ArrayConst::ops[$op], $datas[$i]['goodsNum']);
+            $updateSql = \Our\Common::format(" goods_storage = case goods_commonid  WHEN {0} THEN goods_storage{1}{2}, ", $datas[$i]['goodsCommonId'],\Our\ArrayConst::ops[$op], $datas[$i]['goodsNum']);
             if($updateSaleNumFlag){
-                $updateSql = \Our\Common::format(" WHEN {0} THEN goods_storage{1}{2} END,sale_num = case goods_commonid when {0} THEN sale_num {3}{2} END", $datas[$i]['goodsCommonId'],\Our\ArrayConst::ops[$op], $datas[$i]['goodsNum'],$updateSaleNumOp);
+                $updateSql = \Our\Common::format(" goods_storage = case goods_commonid  WHEN {0} THEN goods_storage{1}{2} END,sale_num = case goods_commonid when {0} THEN sale_num {3}{2} END,", $datas[$i]['goodsCommonId'],\Our\ArrayConst::ops[$op], $datas[$i]['goodsNum'],$updateSaleNumOp);
             }
             $dataIds[] = $datas[$i]['goodsCommonId'];
             $updateAllSql .= $updateSql;;
             if ($i % 1000 == 0 && $i != 0) {
+                $updateAllSql = trim($updateAllSql,',');
                 $updateAllSql .= \Our\Common::format(' where goods_commonid in ({0})',implode(',',$dataIds));
                 $one = $this->db->update($this->_tableName)->query($updateAllSql);
                 if (!$one) {
@@ -232,6 +233,7 @@ class GoodsCommonModel extends \DAO\AbstractModel {
             }
         }
         if ($updateAllSql != $baseSql) {
+            $updateAllSql = trim($updateAllSql,',');
             $updateAllSql .= \Our\Common::format(' where goods_commonid in ({0})',implode(',',$dataIds));
             $one = $this->db->update($this->_tableName)->query($updateAllSql);