Commit 41dc72f6 by 周晓航

加价购活动查询新增限制

parent d5a2a3da
...@@ -53,6 +53,13 @@ public class PremiumExchangeRequestVo { ...@@ -53,6 +53,13 @@ public class PremiumExchangeRequestVo {
private Integer bizType; private Integer bizType;
/** /**
* 储值卡需求: 使用的储值卡是否与 促销活动同享
*/
@ApiModelProperty(value = "是否与营销活动共享 1-是 0-否")
private Integer enableSharing = 1;
/**
* 优惠券code列表 * 优惠券code列表
*/ */
private List<couponCode> couponCodes; private List<couponCode> couponCodes;
......
...@@ -3143,6 +3143,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -3143,6 +3143,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
premiumExchangeResponseVo.setResultCode(ActivityResultCodeEnum.NON_PARTICIPATE.getCode()); premiumExchangeResponseVo.setResultCode(ActivityResultCodeEnum.NON_PARTICIPATE.getCode());
List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCart(partnerId, storeId, userId, request.getSessionId(), null, shoppingCartBaseService,bizType); List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCart(partnerId, storeId, userId, request.getSessionId(), null, shoppingCartBaseService,bizType);
DiscountSharingDto discountSharingDto = new DiscountSharingDto(); DiscountSharingDto discountSharingDto = new DiscountSharingDto();
discountSharingDto.setEnableSharing(request.getEnableSharing());
if (grayPush(partnerId, storeId, "2")) { if (grayPush(partnerId, storeId, "2")) {
// 当couponCode不为空时,需参与价格计算 // 当couponCode不为空时,需参与价格计算
ArrayList<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = new ArrayList<>(); ArrayList<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = new ArrayList<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment