fix

service/service_ly.go

@@ -195,7 +195,7 @@ func (ls *LyService) GetActivity(sku model.LySku) model.LySku {
 	}
 	}
 
 
 	//获取是否能使用优惠券
 	//获取是否能使用优惠券
-	if giftActivity.AllowCoupon != 1 || priceActivity.AllowCoupon != 1 {
+	if giftActivity.AllowCoupon != 2 || priceActivity.AllowCoupon != 2 {
 		sku.AllowCoupon = 0
 		sku.AllowCoupon = 0
 	}
 	}
 	return sku
 	return sku

service/service_zy_common.go

 package service
 package service
 
 
 import (
 import (
+	"fmt"
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin"
 	"github.com/gomodule/redigo/redis"
 	"github.com/gomodule/redigo/redis"
 	"github.com/iancoleman/orderedmap"
 	"github.com/iancoleman/orderedmap"
@@ -99,13 +100,15 @@ func (qs *ZiyingService) HDActivityPrice(SkuInfo string) *orderedmap.OrderedMap
 		A.Set("has_gift_activity", 1)
 		A.Set("has_gift_activity", 1)
 		A.Set("gift_activity", giftActivity)
 		A.Set("gift_activity", giftActivity)
 	}
 	}
+	fmt.Println(priceActivity.AllowCoupon)
+	fmt.Println(giftActivity.AllowCoupon)
 	//其中一类活动不允许优惠券,这个商品就不允许使用优惠券
 	//其中一类活动不允许优惠券,这个商品就不允许使用优惠券
 	var allowCoupon int
 	var allowCoupon int
-	if priceActivity.HasActivity && priceActivity.AllowCoupon == 0 {
+	if priceActivity.HasActivity && priceActivity.AllowCoupon == 2 {
 		allowCoupon = 0
 		allowCoupon = 0
 		A.Set("allow_coupon", allowCoupon)
 		A.Set("allow_coupon", allowCoupon)
 	}
 	}
-	if giftActivity.HasActivity && giftActivity.AllowCoupon == 0 {
+	if giftActivity.HasActivity && giftActivity.AllowCoupon == 2 {
 		allowCoupon = 0
 		allowCoupon = 0
 		A.Set("allow_coupon", allowCoupon)
 		A.Set("allow_coupon", allowCoupon)
 	}
 	}