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

application/models/Business/Cart/CartService.php

@@ -603,7 +603,7 @@ class CartServiceModel extends \Business\AbstractModel{
         foreach($storeIds as $storeId){
             $store = $storeDao->get($storeId,false);
             $storeCarts = $storeCartData['cartList'][$storeId];
-            $deliverySetting['onelinePay'] = $store['wx_pay'];//是否支持线上支付
+            $deliverySetting['onelinePay'] = $store['wx_pay']&&$store['onlinepay_flag']?\Our\ApiConst::one:\Our\ApiConst::zero;//是否支持线上支付
             $deliverySetting['offlinePay'] = $store['offline_pay'];
 
             if($deliverySetting['offlinePay']){
@@ -680,7 +680,7 @@ class CartServiceModel extends \Business\AbstractModel{
         foreach($storeIds as $storeId){
             $store = $storeDao->get($storeId,false);
             $storeCarts = $storeCartData['cartList'][$storeId];
-            $deliverySetting['onelinePay'] = $store['wx_pay'];//是否支持线上支付
+            $deliverySetting['onelinePay'] = $store['wx_pay']&&$store['onlinepay_flag']?\Our\ApiConst::one:\Our\ApiConst::zero;//是否支持线上支付
             $deliverySetting['offlinePay'] = $store['offline_pay'];
             $deliverySetting['offlinePayway'] = array('payway'=>'','imageUrls'=>array());
             if($deliverySetting['offlinePay']){

application/models/DAO/Goods.php

@@ -240,8 +240,15 @@ class GoodsModel extends \DAO\AbstractModel {
                 if($op==\Our\ApiConst::plus){
                     $updateGoodsNum = -$updateGoodsNum;
                 }
+
                 if($goodsCommonRedis->tableHExists($onlineGoodsCommonSaleNumKey,$goodsCommonId)){
-                    $goodsCommonRedis->tableHIncrBy($onlineGoodsCommonSaleNumKey,$goodsCommonId,$updateGoodsNum);
+                    $oldSaleNum = $goodsCommonRedis->tableHGet($onlineGoodsCommonSaleNumKey,$goodsCommonId);
+                    if($op==\Our\ApiConst::plus&&($oldSaleNum+$updateGoodsNum)<\Our\ApiConst::zero){
+                        $updateGoodsNum = \Our\ApiConst::zero;
+                        $goodsCommonRedis->tableHSet($onlineGoodsCommonSaleNumKey,$goodsCommonId,$updateGoodsNum);
+                    }else{
+                        $goodsCommonRedis->tableHIncrBy($onlineGoodsCommonSaleNumKey,$goodsCommonId,$updateGoodsNum);
+                    }
                 }
             }
             \DAO\PBundlingModel::getInstance()->deletePBundlingByGoodsCommonId($goodsCommonId);