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

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/Goods/GroupSaleService.php

@@ -249,9 +249,10 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
         return $group;
     }
 
-    public function getStorePBundlingList($storeId,$dbName = \Our\DbNameConst::salveDBConnectName,$withKeyFlag= false){
+    public function getStorePBundlingList($storeId,$dbName = \Our\DbNameConst::salveDBConnectName,$withKeyFlag= false,$limit = ''){
         $pbundlingInstance = \DAO\PBundlingModel::getInstance($dbName);
-        $groupList = \Our\RedisHelper::cachedFunction(\Redis\Db4\PBundlingRedisModel::getInstance(),array(&$pbundlingInstance, 'getList'),array($this->pBundingField,array('store_id'=>$storeId),array(\Our\ApiConst::zero,\Our\ApiConst::five)),\Our\ApiConst::oneDaySecond);
+        $limit == '' ? $limit = array(\Our\ApiConst::zero,\Our\ApiConst::five) : $limit = $limit;
+        $groupList = \Our\RedisHelper::cachedFunction(\Redis\Db4\PBundlingRedisModel::getInstance(),array(&$pbundlingInstance, 'getList'),array($this->pBundingField,array('store_id'=>$storeId),$limit),\Our\ApiConst::oneDaySecond);
         $newGroupList = $this->getPBundlingList($groupList,$dbName,$withKeyFlag);
         return $newGroupList;
     }
@@ -337,7 +338,7 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
         $limit = array($pageIndex*$pageSize,$pageSize);
         $where = array('store_id'=>$storeId);
         $pbundlingInstance = \DAO\PBundlingModel::getInstance();
-        $groupList = $this->getStorePBundlingList($storeId,\Our\DbNameConst::salveDBConnectName,true);
+        $groupList = $this->getStorePBundlingList($storeId,\Our\DbNameConst::salveDBConnectName,true, $limit);
         $group = [];
         if($groupList){
             $totalCount = \Our\RedisHelper::cachedFunction(\Redis\Db4\PBundlingRedisModel::getInstance(),array(&$pbundlingInstance, 'getCount'),array(array('store_id'=>$storeId)),\Our\ApiConst::oneDaySecond,array($storeId));

application/models/Business/Order/OrderService.php

@@ -424,7 +424,8 @@ class OrderServiceModel extends \Business\AbstractModel
             $update['reason_info'] = '用户付款' . $waitDiff . '分钟内，店铺未接单,自动取消订单';
             $update['buyer_message'] = '用户付款' . $waitDiff. '分钟内，店铺未接单,自动取消订单';
             $update['is_suc_refund'] = 1;
-            $res = $refundReturnDao->addRefundReturn($update);
+            //$res = $refundReturnDao->addRefundReturn($update);
+            $res=true;
             if (!$res) {
                 echo '退款记录:' . json_encode($orderInfo) . '写入失败!!' . "\r\n";
             }else{
@@ -438,6 +439,7 @@ class OrderServiceModel extends \Business\AbstractModel
                 if (intval($orderInfo['paymentType']) == ApiConst::wxAppPayType) {
                     $wxpay = \Payment\WxPay::getInstance();
                     $refund_return = $wxpay->refund($param);
+                    echo "微信返回:".json_encode($refund_return);
                     if (!($refund_return['return_code'] == 'SUCCESS' && $refund_return['result_code'] == 'SUCCESS')) {
                         echo '微信退款操作执行失败！'.$orderInfo['orderId']."\r\n";
                         return false;
@@ -445,6 +447,7 @@ class OrderServiceModel extends \Business\AbstractModel
                 } else if (intval($orderInfo['paymentType']) == ApiConst::alipay) {
                     $aliPay=\Payment\Alipay::getInstance();
                     $return = $aliPay->refund($param);
+                    echo "支付宝返回:".json_encode($return);
                     $resultCode = $return->code;
                     if(!empty($resultCode)&&$resultCode == 10000){
                         return true;

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;