Skip to content

O
order-group
Commit 7cf8e9e4 by 徐康
Options

商品券使用标签展示

parent 6c40a8aa
Showing with 10 additions and 9 deletions
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
...@@ -2083,15 +2083,16 @@ public class OrderAdapter { ...@@ -2083,15 +2083,16 @@ 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"); productVo.setCouponName(productDiscount.getDiscountDesc());
if(null != extendType && (3 == extendType || 4 == extendType || 5 == extendType)) { // Integer extendType = StringUtils.isBlank(productDiscount.getAddInfo())?null:JSON.parseObject(productDiscount.getAddInfo()).getInteger("extendType");
productVo.setCouponName(productDiscount.getDiscountDesc()); // if(null != extendType && (3 == extendType || 4 == extendType || 5 == extendType)) {
} else { // productVo.setCouponName(productDiscount.getDiscountDesc());
productVo.setName(productDiscount.getDiscountDesc()); // } else {
productVo.setSpuName(productDiscount.getDiscountDesc()); // productVo.setName(productDiscount.getDiscountDesc());
productVo.setExtras(""); // productVo.setSpuName(productDiscount.getDiscountDesc());
productVo.setSpecification(""); // productVo.setExtras("");
} // productVo.setSpecification("");
// }
} }
if (OrderAccountType.BUYM_SENDN.getCode().equals(productDiscount.getDiscountType())) { if (OrderAccountType.BUYM_SENDN.getCode().equals(productDiscount.getDiscountType())) {
activityType = ActivityTypeEnum.TYPE_61.getCode(); activityType = ActivityTypeEnum.TYPE_61.getCode();
......
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