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

application/models/Business/User/FootprintService.php

@@ -162,6 +162,7 @@ class FootprintServiceModel extends \Business\AbstractModel
             \Our\RedisHelper::delCachedFunction(\Redis\Db4\GoodsBrowserRedisModel::getInstance(),array(&$browseDAO, 'getGoodsListWithSale'),array(),array($memberId));
             \Our\RedisHelper::delCachedFunction(\Redis\Db4\GoodsBrowserRedisModel::getInstance(),array(&$browseDAO, 'getGoodsList'),array(),array($memberId));
             \Our\RedisHelper::delCachedFunction(\Redis\Db4\GoodsBrowserRedisModel::getInstance(),array(&$browseDAO, 'getCount'),array(),array($memberId));
+            \Redis\Db1\MemberCenterRedisModel::getInstance()->tableHDel($memberId,\Our\NameConst::footprint);
             return true;
         }
     }

application/models/Business/User/MemberCenterService.php

@@ -68,19 +68,19 @@ class MemberCenterServiceModel extends \Business\AbstractModel
             }
             if($memebrCenterDb1Redis->tableHExists($memberId,NameConst::waitPay) === false){
                 $memberCenter[NameConst::waitPay] = \DAO\Order\OrderModel::getInstance()->getCount(array('order_state'=>ApiConst::orderStateWaitPay,'buyer_id'=>$memberId));
-                $memebrCenterDb1Redis->tableHSet($memberId,NameConst::waitPay,$memberCenter[NameConst::footprint]);
+                $memebrCenterDb1Redis->tableHSet($memberId,NameConst::waitPay,$memberCenter[NameConst::waitPay]);
             }
             if($memebrCenterDb1Redis->tableHExists($memberId,NameConst::waitShipments) === false){
                 $memberCenter[NameConst::waitShipments] = \DAO\Order\OrderModel::getInstance()->getCount(array('order_state in('.ApiConst::orderStateWaitConfirm.','.ApiConst::orderStateWaitSend.')',"buyer_id = {$memberId}"),false);
-                $memebrCenterDb1Redis->tableHSet($memberId,NameConst::waitShipments,$memberCenter[NameConst::footprint]);
+                $memebrCenterDb1Redis->tableHSet($memberId,NameConst::waitShipments,$memberCenter[NameConst::waitShipments]);
             }
             if($memebrCenterDb1Redis->tableHExists($memberId,NameConst::waitReceiving) === false){
                 $memberCenter[NameConst::waitReceiving] = \DAO\Order\OrderModel::getInstance()->getCount(array('order_state'=>ApiConst::orderStateWaitRecieve,'buyer_id'=>$memberId));
-                $memebrCenterDb1Redis->tableHSet($memberId,NameConst::waitReceiving,$memberCenter[NameConst::footprint]);
+                $memebrCenterDb1Redis->tableHSet($memberId,NameConst::waitReceiving,$memberCenter[NameConst::waitReceiving]);
             }
             if($memebrCenterDb1Redis->tableHExists($memberId,NameConst::waitEvaluate) === false){
                 $memberCenter[NameConst::waitEvaluate] = \DAO\Order\OrderModel::getInstance()->getCount(array('order_state'=>ApiConst::orderStateComplete,"buyer_id = {$memberId}",'evaluation_state in('.ApiConst::waitEvaluation.','.ApiConst::pastWaitEvaluation.')'),false);
-                $memebrCenterDb1Redis->tableHSet($memberId,NameConst::waitEvaluate,$memberCenter[NameConst::footprint]);
+                $memebrCenterDb1Redis->tableHSet($memberId,NameConst::waitEvaluate,$memberCenter[NameConst::waitEvaluate]);
             }
             if($memebrCenterDb1Redis->tableHExists($memberId,NameConst::refund) === false){
                 $memberCenter[NameConst::refund] = \DAO\Order\RefundReturnModel::getInstance()->getCount(array('seller_state = '.ApiConst::refundSellerVerify.' OR (is_platform_in = '.ApiConst::platIn.' AND platform_state = '.ApiConst::refundPlatformVerify.')','buyer_id'=>$memberId));

application/models/DAO/SaleMember.php

@@ -98,7 +98,7 @@ class SaleMemberModel extends \DAO\AbstractModel {
      */
     public function isJoinPlatform($memberId){
         //$saleDAO = \DAO\SaleMemberModel::getInstance();
-        $activities = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsBrowserRedisModel::getInstance(),array(&$this, 'getActAndSale'),array(array('han_sale_member.member_id'=>$memberId),'han_sale_activity.sale_act_id,han_sale_activity.sale_start_date,han_sale_activity.sale_end_date,han_sale_member.sale_id'),\Our\ApiConst::tenMinSecond);
+        $activities = \Our\RedisHelper::cachedFunction(\Redis\Db4\SaleMemberRedisModel::getInstance(),array(&$this, 'getActAndSale'),array(array('han_sale_member.member_id'=>$memberId),'han_sale_activity.sale_act_id,han_sale_activity.sale_start_date,han_sale_activity.sale_end_date,han_sale_member.sale_id'),\Our\ApiConst::tenMinSecond);
         $acts = [];
         if($activities){
             foreach ($activities as $k=>$v){

scripts/crontab/user/addBrowse.php

@@ -28,12 +28,10 @@ while ($memberId = $browserDb4Redis->tableSPop('memberIds')){
                 }
                 $return = \DAO\GoodsBrowseModel::getInstance()->insertAllOrUpdate($datas);
                 if($return){
-                    \Redis\Db1\MemberCenterRedisModel::getInstance()->tableHDel($memberId,\Our\NameConst::footprint);
                     $browserDb4Redis->tableDel('memberId:g_'.$memberId);
                 }
             }
-//            \Redis\Db1\MemberCenterRedisModel::getInstance()->tableHDel($memberId,\Our\NameConst::footprint);
-//            $browserDb4Redis->tableDel('memberId:'.$memberId);
+            \Redis\Db1\MemberCenterRedisModel::getInstance()->tableHDel($memberId,\Our\NameConst::footprint);
         }
     }else{
         $records = $browserDb4Redis->tableHGAll('memberId:g_'.$memberId);
@@ -46,10 +44,10 @@ while ($memberId = $browserDb4Redis->tableSPop('memberIds')){
             }
             $return = \DAO\GoodsBrowseModel::getInstance()->insertAllOrUpdate($datas);
             if($return){
-                \Redis\Db1\MemberCenterRedisModel::getInstance()->tableHDel($memberId,\Our\NameConst::footprint);
                 $browserDb4Redis->tableDel('memberId:'.$memberId);
             }
         }
+        \Redis\Db1\MemberCenterRedisModel::getInstance()->tableHDel($memberId,\Our\NameConst::footprint);
     }
 }