Skip to content

O
order-group
Commit 06b633c9 by 徐康
Options

非空判断

parent b8ff05e1
Showing with 8 additions and 6 deletions
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
...@@ -2180,12 +2180,14 @@ public class OrderAdapter { ...@@ -2180,12 +2180,14 @@ 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;
JSONObject productDiscountExtInfo = JSON.parseObject(productDiscount.getExtInfo()); if(StringUtils.isNotBlank(productDiscount.getExtInfo())) {
Integer extendType = productDiscountExtInfo.getInteger("extendType"); JSONObject productDiscountExtInfo = JSON.parseObject(productDiscount.getExtInfo());
if(null == extendType || extendType != 12) { Integer extendType = productDiscountExtInfo.getInteger("extendType");
productVo.setCouponName(productDiscount.getDiscountDesc()); if(null == extendType || extendType != 12) {
} else { productVo.setCouponName(productDiscount.getDiscountDesc());
productVo.setFinalPrice(productVo.getOriginalPrice()); } else {
productVo.setFinalPrice(productVo.getOriginalPrice());
}
} }
} }
if (OrderAccountType.BUYM_SENDN.getCode().equals(productDiscount.getDiscountType())) { if (OrderAccountType.BUYM_SENDN.getCode().equals(productDiscount.getDiscountType())) {
......
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