Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into ccw

application/models/DAO/GoodsCommon.php

@@ -258,22 +258,22 @@ class GoodsCommonModel extends \DAO\AbstractModel {
             $updateSaleNumOp = $op==\Our\ApiConst::minus?'+':'-';
         }
         $goodsCommonSql = ' goods_storage = case goods_commonid ';
-        $goodsEdittimeSql = ' goods_edittime = case goods_commonid ';
+       // $goodsEdittimeSql = ' goods_edittime = case goods_commonid ';
         if($updateSaleNumFlag){
             $saleNumSql = 'sale_num = case goods_commonid ';
         }
         for ($i = 0; $i < count($datas); $i++) {
             $goodsCommonSql .= \Our\Common::format("  WHEN {0} THEN goods_storage{1}{2} ", $datas[$i]['goodsCommonId'],\Our\ArrayConst::ops[$op], $datas[$i]['goodsNum']);
-            $goodsEdittimeSql .= \Our\Common::format("  WHEN {0} THEN goods_edittime={1}", $datas[$i]['goodsCommonId'],TIMESTAMP);
+          //  $goodsEdittimeSql .= \Our\Common::format("  WHEN {0} THEN goods_edittime={1}", $datas[$i]['goodsCommonId'],TIMESTAMP);
             if($updateSaleNumFlag){
                 $saleNumSql .= \Our\Common::format(" when {0} THEN sale_num {1}{2} ", $datas[$i]['goodsCommonId'],$updateSaleNumOp, $datas[$i]['goodsNum']);
             }
             $dataIds[] = $datas[$i]['goodsCommonId'];
             if ($i % 1000 == 0 && $i != 0) {
                 $goodsCommonSql = trim($goodsCommonSql,',').' END';
-                $goodsEdittimeSql = trim($goodsEdittimeSql,',').' END';
+              //  $goodsEdittimeSql = trim($goodsEdittimeSql,',').' END';
                 $updateAllSql .= $goodsCommonSql;
-                $updateAllSql .= $goodsEdittimeSql;
+              //  $updateAllSql .= $goodsEdittimeSql;
                 if($updateSaleNumFlag){
                     $saleNumSql = ','.trim($saleNumSql,',').' END ';
                     $updateAllSql .= $saleNumSql;
@@ -285,7 +285,7 @@ class GoodsCommonModel extends \DAO\AbstractModel {
                 }
                 $updateAllSql = $baseSql;
                 $goodsCommonSql = 'goods_storage = case goods_commonid ';
-                $goodsEdittimeSql = ' goods_edittime = case goods_commonid ';
+           //     $goodsEdittimeSql = ' goods_edittime = case goods_commonid ';
                 if($updateSaleNumFlag){
                     $saleNumSql = 'sale_num = case goods_commonid ';
                 }
@@ -294,9 +294,9 @@ class GoodsCommonModel extends \DAO\AbstractModel {
         }
         if ($goodsCommonSql) {
             $goodsCommonSql = trim($goodsCommonSql,',').' END ';
-            $goodsEdittimeSql = trim($goodsEdittimeSql,',').' END';
+          //  $goodsEdittimeSql = ','.trim($goodsEdittimeSql,',').' END';
             $updateAllSql .= $goodsCommonSql;
-            $updateAllSql .= $goodsEdittimeSql;
+          //  $updateAllSql .= $goodsEdittimeSql;
             if($updateSaleNumFlag){
                 $saleNumSql = ','.trim($saleNumSql,',').' END ';
                 $updateAllSql .= $saleNumSql;