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

application/library/Order/OrderConfirmUtil.php

@@ -1099,7 +1099,7 @@ class OrderConfirmUtil {
         $couponStoreIds[] = \Our\ApiConst::zero;
         $couponIds = array_column($memberCouponArray,'coupon_id');
         $couponSql = \Our\Common::format(' id in ({0}) and store_id in({1})',implode(',',$couponIds),implode(',',$couponStoreIds));
-        $couponDao = \DAO\Coupon\CouponModel::getInstance(\Our\DbNameConst::masterDBConnectName);
+        $couponDao = \DAO\Coupon\CouponModel::getInstance(\Our\DbNameConst::salveDBConnectName);
         $couponList = $couponDao->getCartCouponTitles($couponSql);
         if(!$couponList){
             $storeCartData['couponList'] = array();

application/models/DAO/Coupon/MemberCoupon.php

@@ -68,6 +68,7 @@ class MemberCouponModel extends \DAO\AbstractModel{
         $memberCouponRedisModel = \Redis\Db13\MemberCouponRedisModel::getInstance();
         $memberCoupons = $memberCouponRedisModel->tableCacheGet(\Our\NameConst::memberCounponListPrefix.$memberId);
         if($memberCoupons){
+            $memberCoupons = unserialize($memberCoupons);
             $newMemberCouponArray = array();
             foreach($memberCoupons as $tempMemberCoupon){
                 if($tempMemberCoupon['out_time']>=TIMESTAMP){
@@ -81,7 +82,7 @@ class MemberCouponModel extends \DAO\AbstractModel{
         $field = 'coupon_id,add_time,out_time';
         $memberCoupons = $this->getList($where , $field);
         if($memberCoupons){
-            $memberCouponRedisModel->tableCacheSet(\Our\NameConst::memberCounponListPrefix.$memberId,$memberCoupons,\Our\ApiConst::oneDaySecond);
+            $memberCouponRedisModel->tableCacheSet(\Our\NameConst::memberCounponListPrefix.$memberId,serialize($memberCoupons),\Our\ApiConst::oneDaySecond);
         }
         return $memberCoupons;
     }

application/models/DAO/PBundling.php

@@ -192,7 +192,6 @@ class PBundlingModel extends \DAO\AbstractModel {
             return false;
         }
         $pBundling = $result['result'];
-        \Our\Log::getInstance()->write(json_encode($pBundling),'/data/log/apptest');
         $key = $result['key'];
         if($op == \Our\ApiConst::minus){
             $pBundling['bl_storage'] = $pBundling['bl_storage']-$blStorage;
@@ -205,9 +204,7 @@ class PBundlingModel extends \DAO\AbstractModel {
             $pBundling['bl_storage'] = $pBundling['bl_storage']+$blStorage;
             $pBundling['bl_origin_storage'] = $pBundling['bl_origin_storage']+$blStorage;
         }
-        \Our\Log::getInstance()->write(json_encode($pBundling),'/data/log/apptest');
         \Lock\RedisLock::getInstance()->releaseLock(\Our\NameConst::pBundlingStorageRedisPrefix.$blId);
-        \Our\Log::getInstance()->write($key,'/data/log/apptest');
         return $pBundlingRedisDao->setNoPrefix($key,serialize($pBundling),\Our\ApiConst::oneDaySecond);
     }
 
@@ -253,13 +250,27 @@ class PBundlingModel extends \DAO\AbstractModel {
 
 
     public function deletePBundlingByBlId($blId){
-        $pBundlingDao = \Redis\Db4\PBundlingRedisModel::getInstance();
-        $pBundlingDao->tableDelAll($pBundlingDao->tableKeys('gid_'.$blId));
+        $isLock = \Lock\RedisLock::getInstance()->getLock(\Our\NameConst::pBundlingStorageRedisPrefix.$blId);
+        if(!$isLock){
+            \Error\ErrorModel::throwException(\Error\CodeConfigModel::serverBusy);
+        }
+        $pBundlingRedisDao = \Redis\Db4\PBundlingRedisModel::getInstance();
+        $pBundlingRedisDao->tableDelAll($pBundlingRedisDao->tableKeys('gid_'.$blId));
+        $groups=\Business\Goods\GroupSaleServiceModel::getInstance()->getPBundlingListByBlIds(array($blId));
+        var_dump($groups);
+        \Lock\RedisLock::getInstance()->releaseLock(\Our\NameConst::pBundlingStorageRedisPrefix.$blId);
+        return true;
     }
 
     public function deletePBundlingByGoodsCommonId($goodsCommonId){
         $pBundlingDao = \Redis\Db4\PBundlingRedisModel::getInstance();
-        return $pBundlingDao->tableDelAll($pBundlingDao->tableKeys('*'.\Our\NameConst::blGoods.$goodsCommonId));
+        $blIdsStrs = $pBundlingDao->tableKeys('*'.\Our\NameConst::blGoods.$goodsCommonId);
+        foreach($blIdsStrs as $blIdStr){
+            $newstr = substr($blIdStr,strpos($blIdStr,'gid_')+4);
+            $blId =  substr($newstr,0,(strlen($newstr)-strlen(substr($newstr,strpos($newstr,'_goodsCommon')))));
+            $this->deletePBundlingByBlId($blId);
+        }
+        return true;
     }
 
     /**

conf/application.ini

@@ -439,21 +439,21 @@ elastic.master.scheme="http";
 [lyz : common]
 ; 数据库配置
 resources.database.params.driver   = "pdo_mysql"
-resources.database.params.hostname = "106.14.14.233"
+resources.database.params.hostname = "127.0.0.1"
 resources.database.params.port     = 3306
 resources.database.params.database = "qmcs"
 resources.database.params.username = "root"
-resources.database.params.password = "!@#$%12345werty"
+resources.database.params.password = "123456"
 resources.database.params.charset  = "UTF8"
 resources.database.params.driver_options.1002 = "SET NAMES utf8"
 
 ; 从库配置
 resources.database.slave.params.driver   = "pdo_mysql"
-resources.database.slave.params.hostname = "106.14.14.233"
+resources.database.slave.params.hostname = "127.0.0.1"
 resources.database.slave.params.port     = 3306
 resources.database.slave.params.database = "qmcs"
 resources.database.slave.params.username = "root"
-resources.database.slave.params.password = "!@#$%12345werty"
+resources.database.slave.params.password = "123456"
 resources.database.slave.params.charset  = "UTF8"
 resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"