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

application/library/Payment/TencentPay.php

@@ -124,6 +124,7 @@ class TencentPay {
         $this->postXml($this->orderquery_url);
         $this->result = $this->xmlToArray($this->response);
         \Our\Log::getInstance()->write(json_encode($this->result),'/data/log/apptest');
+        \Our\Log::getInstance()->write(json_encode($this->result),'/data/log/apptest');
         if($this->result['return_code']=="SUCCESS"&&$this->result['result_code']=="SUCCESS"&&$this->result['trade_state']=="SUCCESS"){
             return true;
         }

application/models/Business/Coupon/CouponService.php

@@ -406,11 +406,15 @@ class CouponServiceModel extends \Business\AbstractModel{
                     if($coupon['is_overlay'] == \Our\ApiConst::zero){ //不允许领用多张
                         $coupon['isGet'] = \Our\ApiConst::one;
                     }else if($coupon['is_overlay'] == \Our\ApiConst::one){//允许领用多张
-                        $couponStates = array_column($memberTempCoupons,'coupon_state');
-                        if(in_array(\Our\ApiConst::availCouponState,$couponStates)){
-                            $coupon['isGet'] = \Our\ApiConst::one;
+                        if($coupon['get_ticket_num']>\Our\ApiConst::zero&&$coupon['get_ticket_num']>=count($memberTempCoupons)){ //领取张数超过上限
+                            $coupon['isGet'] = \Our\ApiConst::zero;
                         }else{
-                            $coupon[ 'isGet'] = \Our\ApiConst::zero;
+                            $couponStates = array_column($memberTempCoupons,'coupon_state');
+                            if(in_array(\Our\ApiConst::availCouponState,$couponStates)){//存在可使用的优惠券 ,则不能重复领用
+                                $coupon['isGet'] = \Our\ApiConst::zero;
+                            }else{
+                                $coupon['isGet'] = \Our\ApiConst::one;
+                            }
                         }
                     }
                 }

application/models/DAO/Coupon/Coupon.php

@@ -23,7 +23,7 @@ class CouponModel extends \DAO\AbstractModel {
      */
     protected $_primaryKey = 'id';
 
-    protected $availStoreIndexField = 'id,type,ROUND(cash_money/100,0) as cash_money,ROUND(order_amount/100,0) as order_amount,discount,store_id,coupon_type,is_overlay,start_time,end_time,gift_coupon_id';
+    protected $availStoreIndexField = 'id,type,ROUND(cash_money/100,0) as cash_money,ROUND(order_amount/100,0) as order_amount,discount,store_id,coupon_type,is_overlay,start_time,end_time,gift_coupon_id,get_ticket_num';
     protected $availTitleField = 'id,type,ROUND(cash_money/100,0) as cash_money,ROUND(order_amount/100,0) as order_amount,discount,store_id,coupon_type,is_overlay,start_time,end_time,gift_coupon_id,ids';
     protected $availCartStoreIndexField = 'id,type,ROUND(cash_money/100,0) as cash_money,ROUND(order_amount/100,0) as order_amount,discount,store_id,coupon_type,is_overlay,start_time,end_time,ids,gift_coupon_id,gift_goods_ids';