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

application/library/Order/OrderConfirmUtil.php

@@ -921,7 +921,7 @@ class OrderConfirmUtil {
             if($tempOrder['coupon_id']>\Our\ApiConst::zero){
                 $couponIds[$tempOrder['order_id']] = $tempOrder['coupon_id'];
             }
-            $orderModel->deleteOrderCache($tempOrder['buyer_id'],$tempOrder['order_id']);
+            $orderModel->deleteOrderCache($tempOrder['buyer_id'],$tempOrder['order_id'],$tempOrder['store_id'],true,true);
             \Our\RedisHelper::memberTotalFromStateToState($tempOrder['buyer_id'],ApiConst::orderStateWaitPay,ApiConst::orderStateWaitConfirm);
         }
         //送券、送礼品

application/library/Our/DescribeConst.php

@@ -140,7 +140,7 @@ class DescribeConst
 
     const payOnlineName = '线上支付'; //线上支付
     const payOfflineName = '线下支付'; //线下支付
-    const payAogName = '到店自提'; //到店自提
+    const payAogName = '货到付款'; //货到付款
 
     const refund='退款';
     const refundRetund='退货';

application/models/Business/Order/OrderService.php

@@ -293,7 +293,7 @@ class OrderServiceModel extends \Business\AbstractModel
                     $orderGoodsDao->update($where,$orderGoodsUpdateData);
                 }
                 if ($memberId) {
-                    $orderDao->deleteOrderCache($memberId, $orderId, $order['store_id']);
+                    $orderDao->deleteOrderCache($memberId, $orderId, $order['store_id'],true);
                     // $memberDao->fromOrderStateToOrderState($memberId,$order['order_state'],ApiConst::orderStateCancel);
                 }
             }
@@ -315,7 +315,7 @@ class OrderServiceModel extends \Business\AbstractModel
         if ($isAllowConfirm) {
             $res = $orderDao->updateStatusByOrderId($orderId, ApiConst::orderStateComplete, TRUE);
             if ($res) {
-                $orderDao->deleteOrderCache($memberId, $orderId, $order['store_id']);
+                $orderDao->deleteOrderCache($memberId, $orderId, $order['store_id'],true);
                 return true;
             } else {
                 ErrorModel::throwException(CodeConfigModel::receiveError);
@@ -520,7 +520,7 @@ class OrderServiceModel extends \Business\AbstractModel
                 if(!$update || !$res){
                        echo '订单:'.$order['orderId'].'没取消成功!';
                 }
-                $orderDao->deleteOrderCache($order['buyerId'],(string)$order['orderId'],$order['storeId']);
+                $orderDao->deleteOrderCache($order['buyerId'],(string)$order['orderId'],$order['storeId'],true);
             }
             $orderIds = array_column($orders, 'orderId');
             //更新商品库存
@@ -571,7 +571,7 @@ class OrderServiceModel extends \Business\AbstractModel
                             $this->changeOrderStateCancelUnconditional($order);
                         }
                     }
-                    $orderDao->deleteOrderCache($order['buyerId'],(string)$order['orderId'],$order['storeId']);
+                    $orderDao->deleteOrderCache($order['buyerId'],(string)$order['orderId'],$order['storeId'],true);
                 }
 
             $orderIds = array_column($orders, 'orderId');
@@ -623,13 +623,13 @@ class OrderServiceModel extends \Business\AbstractModel
                 if ($order['shippingType'] == ApiConst::bySeller) {
                     if (isset($qmDeliverymanLogsOrderIds[$order['orderId']])) {
                         array_push($sellerOrderIds, $order['orderId']);
-                        $orderDao->deleteOrderCache($order['buyerId'], $order['orderId'], $order['storeId']);
+                        $orderDao->deleteOrderCache($order['buyerId'], $order['orderId'], $order['storeId'],true);
                     }
                 } else {
                     $limitTime = TIMESTAMP - ApiConst::orderWaitRecieveThreeDays;
                     if ($order['acceptTime'] < $limitTime) {
                         array_push($expressOrderIds, $order['orderId']);
-                        $orderDao->deleteOrderCache($order['buyerId'], $order['orderId'], $order['storeId']);
+                        $orderDao->deleteOrderCache($order['buyerId'], $order['orderId'], $order['storeId'],true);
                     }
                 }
                 \Our\RedisHelper::memberTotalFromStateToState($order['buyerId'], $order['orderState'], ApiConst::orderStateComplete);
@@ -841,7 +841,7 @@ class OrderServiceModel extends \Business\AbstractModel
                 $push = Push::getInstance();
                 $push->reacheRemind($order['buyerId'], $order['orderId'], $order['orderSn']);
             }
-            $orderDao->deleteOrderCache($memberid, $qmDeliveryManLog['orderId'], $order['storeId']);
+            $orderDao->deleteOrderCache($memberid, $qmDeliveryManLog['orderId'], $order['storeId'],true);
             $qmDeliverymanLogDao->deleteOrderCache($deliverymanId, $id);
             return $updateResult;
         } else {

application/models/Business/Order/RefundService.php

@@ -398,7 +398,7 @@ class RefundServiceModel extends \Business\AbstractModel
         $refundArrayUnLine=Common::convertUnderline($refundArray);
         $state = $refundReturnDao->addRefundReturn($refundArray,$orderInfo,$orderGoods);
         if ($state) {
-            $orderDao->deleteOrderCache($memberId,$refund['orderId']);
+            $orderDao->deleteOrderCache($memberId,$refund['orderId'],$refund['storeId'],true);
             $refundReturnDao->deleteRefundCache($memberId);
             $refundStateName=$refundReturnDao->getRefundTextStatus($refundArrayUnLine);
             $orderGoodsDao->update(array('rec_id'=>$orderGoods['recId']),array('refund_state_name'=>$refundStateName,'refund_id'=>$state));

application/models/Business/Store/ShopkeeperService.php

@@ -237,7 +237,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         } else {
             $update_data['order_state'] = ApiConst::orderStateWaitSend;
             $result = $orderDao->update($where, $update_data);
-            $orderDao->deleteOrderCache($order['buyer_id'], $orderId,$order['store_id']);
+            $orderDao->deleteOrderCache($order['buyer_id'], $orderId,$order['store_id'],true);
             \Our\RedisHelper::memberTotalFromStateToState($order['buyer_id'], $order['order_state'], ApiConst::orderStateWaitSend);
             return $result;
         }