优惠券

application/controllers/Cart.php

@@ -114,7 +114,6 @@ class CartController extends \Our\Controller_AbstractApi{
         $gcIds = isset($cartList['gcIds'])?$cartList['gcIds']:array();
         $storeCartData = array('cartList'=>$cartList['list'],'storeIds'=>$storeCartList['storeIds'],'goodsIds'=>$storeCartList['goodsIds'],'goodsCommonIds'=>$storeCartList['goodsCommonIds'],'blIds'=>$storeCartList['blIds'],'gcIds'=>$gcIds);
         //var_dump($storeCartData);
-        //$this->success($storeCartData);
         $storeCartData = $cartService->checkCouponForCart($storeCartData,$this->memberId);
         //$this->success($storeCartData);
         $storeCartData = $cartService->getDeliveryTypeForCart($address,$storeCartData);

application/models/DAO/Coupon/Coupon.php

@@ -366,7 +366,7 @@ class CouponModel extends \DAO\AbstractModel {
         $totalPrice = \Our\ApiConst::zero;
         if($gcTotalPriceArray){
             foreach($gcTotalPriceArray as $key=>$gcTotalPrice){
-                if(strpos($coupon['ids'],','.$key.',')===\Our\ApiConst::zero||strpos($coupon['ids'],','.$key.',')>\Our\ApiConst::zero){
+                if(strpos($coupon['ids'],','.$key.',')!==false){
                     $totalPrice +=$gcTotalPrice['totalPrice'];
                 }
             }
@@ -421,7 +421,7 @@ class CouponModel extends \DAO\AbstractModel {
         foreach($goodsList as $goods){
             $goodsNum = $goods['goodsNum'];
             if($goods['type']== \Our\ApiConst::addGoodsToCart){
-                if(strpos($giftGoodsIds,','.$goods['goodsId'].',')===\Our\ApiConst::zero||strpos($giftGoodsIds,','.$goods['goodsId'].',')>\Our\ApiConst::zero){
+                if(strpos($giftGoodsIds,','.$goods['goodsCommonId'].',')!==false){
                     $giftGoodsAmount += $goods['goodsPrice'];
                     $goodsNum = $goods['goodsNum']-\Our\ApiConst::one;
                 }
@@ -449,7 +449,7 @@ class CouponModel extends \DAO\AbstractModel {
                 return false;
             }
             foreach($gcPrices as $key=>$gcTotalPrice){
-                if(strpos($coupon['ids'],','.$key.',')===\Our\ApiConst::zero||strpos($coupon['ids'],','.$key.',')>\Our\ApiConst::zero){
+                if(strpos($coupon['ids'],','.$key.',')!==false){
                     $totalPrice +=$gcTotalPrice;
                 }
             }
@@ -458,12 +458,12 @@ class CouponModel extends \DAO\AbstractModel {
                 return false;
             }
             foreach($goodsCommonPrices as $key=>$goodsCommonPrice){
-                if(strpos($coupon['ids'],','.$key.',')===\Our\ApiConst::zero||strpos($coupon['ids'],','.$key.',')>\Our\ApiConst::zero){
+                if(strpos($coupon['ids'],','.$key.',')!==false){
                     $totalPrice += $goodsCommonPrice;
                 }
             }
         }else if($coupon['type'] == \Our\ApiConst::commonCoupon){//普通优惠券
-            if($storeCouponPrice>\Our\ApiConst::zero){
+            if($storeCouponPrice==\Our\ApiConst::zero){
                 return false;
             }
             $totalPrice += $storeCouponPrice;