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

application/models/DAO/PBundling.php

@@ -196,7 +196,7 @@ class PBundlingModel extends \DAO\AbstractModel {
         $key = $result['key'];
         if($op == \Our\ApiConst::minus){
             $pBundling['bl_storage'] = $pBundling['bl_storage']-$blStorage;
-            if($pBundling['bl_storage']-$blStorage<\Our\ApiConst::zero){
+            if($pBundling['bl_storage']<\Our\ApiConst::zero){
                 \Lock\RedisLock::getInstance()->releaseLock(\Our\NameConst::pBundlingStorageRedisPrefix.$blId);
                 \Error\ErrorModel::throwException(\Error\CodeConfigModel::pBundlingNoStorageForOrder);
             }