Commit c7003bc7 by 徐康

万能券展示问题

parent a3da1bba
......@@ -1948,7 +1948,7 @@ public class OrderAdapter {
discountTotalAmount = discountTotalAmount + productDiscount.getDiscountAmount()*productDiscount.getDiscountQty();
if (OrderAccountType.PRODUCT_COUPON.getCode().equals(productDiscount.getDiscountType())) {
hasProductCoupon = true;
Integer extendType = JSON.parseObject(productDiscount.getAddInfo()).getInteger("extendType");
Integer extendType = StringUtils.isBlank(productDiscount.getAddInfo())?null:JSON.parseObject(productDiscount.getAddInfo()).getInteger("extendType");
if(null != extendType && 4 == extendType) {
productVo.setCouponName(productDiscount.getDiscountDesc());
} else {
......
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