券标签问题修复

order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java

@@ -330,6 +330,7 @@ public class DeliveryAdapter {
                 if (OldOrderAccountType.COUPON.getCode().equals(accountBean.getType())
                         || OldOrderAccountType.BUY_DISCOUNT.getCode().equals(accountBean.getType())
                         || OldOrderAccountType.PRODUCT_COUPON.getCode().equals(accountBean.getType())
+                        || OldOrderAccountType.EVM_PRODUCT_COUPON.getCode().equals(accountBean.getType())
                         || OldOrderAccountType.SUPER_PURCHASE.getCode().equals(accountBean.getType())
                         || OldOrderAccountType.DISCOUNT_AMOUNT.getCode().equals(accountBean.getType())
                         || OldOrderAccountType.FREIGHT_COUPON.getCode().equals(accountBean.getType())) {

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -2352,7 +2352,7 @@ public class OrderAdapter {
                     continue;
                 }
                 discountTotalAmount = discountTotalAmount + productDiscount.getDiscountAmount()*productDiscount.getDiscountQty();
-                if (OrderAccountType.PRODUCT_COUPON.getCode().equals(productDiscount.getDiscountType())) {
+                if (OrderAccountType.PRODUCT_COUPON.getCode().equals(productDiscount.getDiscountType()) || OldOrderAccountType.EVM_PRODUCT_COUPON.getCode().equals(productDiscount.getDiscountType())) {
                     hasProductCoupon = true;
                     if(StringUtils.isNotBlank(productDiscount.getExtInfo())) {
                         JSONObject productDiscountExtInfo = JSON.parseObject(productDiscount.getExtInfo());