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

application/library/Our/ApiConst.php

@@ -145,6 +145,8 @@ class ApiConst
     const goodsStateWaitRecieve = 2;
     const goodsStateUnRecieve = 3;
     const goodsStateRecieved = 4;
+
+    const refundStateComplete = 3;
     //是否退款成功
     const refundSuccess = 1;
     const refundFail = 0;

application/models/Business/Goods/CommentService.php

@@ -17,12 +17,12 @@ class CommentServiceModel extends \Business\AbstractModel {
         }
         $pageIndex=$pageIndex+\Our\ApiConst::one;
         $CommentToBuyerDAO = \DAO\CommentToBuyerModel::getInstance();
-        $list = \Our\RedisHelper::cachedFunction(\Redis\Db6\CommentToBuyerRedisModel::getInstance(),array(&$CommentToBuyerDAO, 'getList'),array($where,$pageIndex,$pageSize),\Our\ApiConst::oneMinute,array($memberId));
+        $list = \Our\RedisHelper::cachedFunction(\Redis\Db6\CommentToBuyerRedisModel::getInstance(),array(&$CommentToBuyerDAO, 'getList'),array($where,$pageIndex,$pageSize),\Our\ApiConst::oneHour,array($memberId));
         //$list = \DAO\CommentToBuyerModel::getInstance()->getList($where,$pageIndex,$pageSize);
 
         $comments = [];
         if(is_array($list) && !empty($list)){
-            $totalCount = \Our\RedisHelper::cachedFunction(\Redis\Db6\CommentToBuyerRedisModel::getInstance(),array(&$CommentToBuyerDAO, 'getCount'),array($where),\Our\ApiConst::oneMinute,array($memberId));
+            $totalCount = \Our\RedisHelper::cachedFunction(\Redis\Db6\CommentToBuyerRedisModel::getInstance(),array(&$CommentToBuyerDAO, 'getCount'),array($where),\Our\ApiConst::oneHour,array($memberId));
             foreach ($list as $v){
                 $comments[] = array('id'=>$v['id'],'goodsImage'=>\Our\ImageUtil::getGoodsImgUrl($v['goods_image']),'content'=>$v['content'],'state'=>$v['state'],'addTime'=>$v['addtime']);
             }

application/models/Business/User/MemberCenterService.php

@@ -53,7 +53,7 @@ class MemberCenterServiceModel extends \Business\AbstractModel
             //待评价数量
             $memberCenter[NameConst::waitEvaluate] = $orderDAO->getCount(array('order_state'=>ApiConst::orderStateComplete,'buyer_id'=>$memberId,'evaluation_state'=>ApiConst::waitEvaluation));
             //退款中数量
-            $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));
+            $memberCenter[NameConst::refund] = \DAO\Order\RefundReturnModel::getInstance()->getCount('refund_state != '.ApiConst::refundStateComplete.' AND buyer_id = '.$memberId);
             //店铺收藏数量
             $memberCenter[NameConst::storeCollection] = \DAO\FavoritesStoreModel::getInstance()->getFavoritesStoreCount(array('member_id'=>$memberId,'fav_type'=>1));
             //商品收藏数量
@@ -87,7 +87,7 @@ class MemberCenterServiceModel extends \Business\AbstractModel
                 $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));
+                $memberCenter[NameConst::refund] = \DAO\Order\RefundReturnModel::getInstance()->getCount('refund_state != '.ApiConst::refundStateComplete.' AND buyer_id = '.$memberId);
             }
             foreach ($memberCenter as &$v){
                 $v = (int)$v;