Merge branch 'master' of http://119.23.72.7/q578953158/go_sku_server into master

service/service_zy_common.go

@@ -229,7 +229,12 @@ End: //最终执行
 
         A.Set("ladder_price",ladderType)
         A.Set("ratio",ratio)
-        A.Set("ac_type",Actype)
+
+		A.Set("ac_type",Actype)
+		if gjson.Get(GoodsActivityPrice,"activity_type").Int() == 2 {
+			A.Set("ac_type",8)
+		}
+
 		allow_coupon := gjson.Get(GoodsActivityPrice,"allow_coupon").Int()
 		if gjson.Get(GoodsActivityPrice,"allow_coupon").Int() == 0 {
 			allow_coupon = 1