Commit 95f48a92 by xiaoer.li@freemud.com

Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa

parents b7cb5ec9 70f564dc
...@@ -104,6 +104,7 @@ public class CalculationSharingDiscountService { ...@@ -104,6 +104,7 @@ public class CalculationSharingDiscountService {
CalculationSharingDiscountRequestDto.CalculationDiscountCoupon coupon = new CalculationSharingDiscountRequestDto.CalculationDiscountCoupon(); CalculationSharingDiscountRequestDto.CalculationDiscountCoupon coupon = new CalculationSharingDiscountRequestDto.CalculationDiscountCoupon();
coupon.setCode(checkSpqInfo.getCouponCode()); coupon.setCode(checkSpqInfo.getCouponCode());
coupon.setActivityCode(checkSpqInfo.getActiveCode()); coupon.setActivityCode(checkSpqInfo.getActiveCode());
log.info("coupons={},coupon={}", JSON.toJSONString(coupons), JSON.toJSONString(coupon));
coupons.add(coupon); coupons.add(coupon);
// 添加商品券代表的商品放入促销 // 添加商品券代表的商品放入促销
......
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