Skip to content

O
order-group
Commit 76467730 by 徐康
Options

万能券展示问题

parent 4cae09b4
Showing with 2 additions and 1 deletions
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
...@@ -1982,7 +1982,8 @@ public class OrderAdapter { ...@@ -1982,7 +1982,8 @@ public class OrderAdapter {
discountTotalAmount = discountTotalAmount + productDiscount.getDiscountAmount()*productDiscount.getDiscountQty(); discountTotalAmount = discountTotalAmount + productDiscount.getDiscountAmount()*productDiscount.getDiscountQty();
if (OrderAccountType.PRODUCT_COUPON.getCode().equals(productDiscount.getDiscountType())) { if (OrderAccountType.PRODUCT_COUPON.getCode().equals(productDiscount.getDiscountType())) {
hasProductCoupon = true; hasProductCoupon = true;
Integer extendType = StringUtils.isBlank(productDiscount.getAddInfo())?null:JSON.parseObject(productDiscount.getAddInfo()).getInteger("extendType"); if("啡常月享卡".equals(productDiscount.getDiscountDesc()) || (null != extendType && 4 == extendType)) { Integer extendType = StringUtils.isBlank(productDiscount.getAddInfo())?null:JSON.parseObject(productDiscount.getAddInfo()).getInteger("extendType");
if("啡常月享卡".equals(productDiscount.getDiscountDesc()) || (null != extendType && 4 == extendType)) {
productVo.setCouponName(productDiscount.getDiscountDesc()); productVo.setCouponName(productDiscount.getDiscountDesc());
} else { } else {
productVo.setName(productDiscount.getDiscountDesc()); productVo.setName(productDiscount.getDiscountDesc());
......
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