Skip to content

O
order-group
Commit 06b633c9 by 徐康
Options

非空判断

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