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

application/library/Order/OrderConfirmUtil.php

@@ -45,6 +45,8 @@ class OrderConfirmUtil {
 
     private $pushMessageOrders = array();
 
+    private $couponCacheFlag = false;
+
     public  function addOrder($data,$memberId,$currentAddress){
         $storeCartData = $this->checkPostData($data,$memberId,$currentAddress);
         //return $storeCartData;
@@ -423,6 +425,7 @@ class OrderConfirmUtil {
                 if($storeCarts['giftCoupon']){
                     $giftCoupons[]=$storeCarts['giftCoupon'];
                 }
+                $this->couponCacheFlag = true;
             }
             $resultAddress = $addressDao->updateOrderAddress($this->address['address_id'],$this->memberId);
             if(!$resultAddress){
@@ -538,10 +541,18 @@ class OrderConfirmUtil {
         if($this->cartCacheDeleteFlag){
             $this->delCartCache();
         }
+        if($this->couponCacheFlag){
+            $this->delCouponCahce();
+        }
         $this->deleteCacheInfo();
         $this->pushSaleGoods();
     }
 
+    public function delCouponCahce(){
+        $memberCouponDao = \DAO\Coupon\MemberCouponModel::getInstance();
+        \Our\RedisHelper::delCachedFunction(\Redis\Db13\MemberCouponRedisModel::getInstance(),array(&$memberCouponDao, 'getList'),array(),array($this->memberId));
+    }
+
     public function delCartCache(){
         $cartRedis = \Redis\Db7\CartRedisModel::getInstance();
         $memberCartKey = \Our\NameConst::memberCartStorePrefix.$this->memberId;

application/models/Business/Coupon/CouponService.php

@@ -247,14 +247,18 @@ class CouponServiceModel extends \Business\AbstractModel{
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::couponNoUsedTicketNum);
         }
         $memberCouponDao = \DAO\Coupon\MemberCouponModel::getInstance($dbName);
-        if($coupon['is_overlay']){//允许领用多张的优惠券是否存在已经领取的未使用有效优惠券
-            $whereSql = ' coupon_state ='.\Our\ApiConst::couponUnused.' and member_id ='.$memberId.' and coupon_id='.$coupon['id'].' and out_time > '.time();
+        /*if($coupon['is_overlay']){//允许领用多张的优惠券是否存在已经领取的未使用有效优惠券
+            $whereSql = ' member_id ='.$memberId.' and coupon_id='.$coupon['id'].' and out_time > '.time();
             //$memberCoupons = \Our\RedisHelper::cachedFunction(\Redis\Db13\MemberCouponRedisModel::getInstance(), array(&$memberCouponDao, 'getList'),array($whereSql),\Our\ApiConst::oneHour,array($where['couponId']));
             $memberCoupons = $memberCouponDao->getList($whereSql);
+            if($memberCoupons&&count($memberCoupons)>=$coupon['get_ticket_num']){
+                \Error\ErrorModel::throwException(\Error\CodeConfigModel::alreadyGetTheCoupon);
+            }
         }else{//不允许领用多张的优惠券
-            $memberCoupons = \Our\RedisHelper::cachedFunction(\Redis\Db13\MemberCouponRedisModel::getInstance(), array(&$memberCouponDao, 'getList'),array(array('coupon_id'=>$where['couponId'],'member_id'=>$memberId)),\Our\ApiConst::oneHour,array($memberId));
-        }
-        if($memberCoupons&&count($memberCoupons)>0){
+
+        }*/
+        $memberCoupons = \Our\RedisHelper::cachedFunction(\Redis\Db13\MemberCouponRedisModel::getInstance(), array(&$memberCouponDao, 'getList'),array(array('coupon_id'=>$where['couponId'],'member_id'=>$memberId)),\Our\ApiConst::oneHour,array($memberId));
+        if($memberCoupons&&count($memberCoupons)>=$coupon['get_ticket_num']){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::alreadyGetTheCoupon);
         }
         return true;

application/models/Business/Order/OrderService.php

@@ -1008,10 +1008,10 @@ class OrderServiceModel extends \Business\AbstractModel
                             $orderAmount = intval($coupon['order_amount']);
                             if ($coupon['type'] == \Our\ApiConst::noLimitCoupon) {//无门槛优惠券
                                 $temp['type'] = \Our\ApiConst::noLimitCouponType;
-                                $temp['title'] = $coupon['cash_money'];
+                                $temp['title'] = intval($coupon['cash_money']);
                                 $temp['subTitle'] = \Our\DescribeConst::noLimitCoupon;
                             } else if ($coupon['coupon_type'] == \Our\ApiConst::fullMinusCouponType) {//满额减免券
-                                $temp['title'] = $coupon['cash_money'];
+                                $temp['title'] = intval($coupon['cash_money']);
                                 $temp['subTitle'] = \Our\Common::format(\Our\DescribeConst::couponFullAvailable, $orderAmount);
                             } else if ($coupon['coupon_type'] == \Our\ApiConst::discountCouponType) {
                                 $temp['title'] = $coupon['discount'];
@@ -1025,7 +1025,7 @@ class OrderServiceModel extends \Business\AbstractModel
                             }
                             $temp['storeId'] = $coupon['store_id'];
                             if ($temp['storeId']) {
-                                $storeInfo = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$storeDao, 'getInfoById'), array($temp['storeId'], 'store_name'), \Our\ApiConst::oneHour);
+                                $storeInfo = $storeDao->get($temp['storeId'],false);
                                 if (!$storeInfo) {
                                     continue;
                                 }

application/models/Business/Store/StoreService.php

@@ -595,7 +595,7 @@ class StoreServiceModel extends \Business\AbstractModel{
                     }
                 }
                 if($exitStore&&$purchasedStore&&$exitStore['storeId']==$purchasedStore['storeId']){
-                    $returnStores['stores'][] = $purchasedStore;
+                    $returnStores['stores'][] = $exitStore;
                 }else{
                     if(isset($exitStore)&&$exitStore){
                         $returnStores['stores'][] =$exitStore;