From a4b0d502da1415651010de13bef4aeaedb326211 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 20 Sep 2022 15:05:22 +0800 Subject: [PATCH] //third --- .../src/main/java/com/iformall/domain/po/OrderSnapshot.java | 4 +++- .../src/main/java/com/iformall/domain/po/WxCoupon.java | 6 ++++-- .../src/main/java/com/iformall/enums/EnumCouponType.java | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/OrderSnapshot.java b/mallinkService/src/main/java/com/iformall/domain/po/OrderSnapshot.java index fde1f45fe..4ab905789 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/OrderSnapshot.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/OrderSnapshot.java @@ -288,7 +288,9 @@ public class OrderSnapshot extends TenantEntity { } if(type == EnumCouponType.COUPON_CREDIT.getCode() || - type == EnumCouponType.COUPON_CREDIT_PARK.getCode()) { + type == EnumCouponType.COUPON_CREDIT_PARK.getCode() || + type == EnumCouponType.COUPON_CREDIT_DOUYIN.getCode() + ) { return true; } return false; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index 5011d1b3a..6d91a6055 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -417,8 +417,10 @@ public class WxCoupon extends TenantEntity { return false; } - if(type == EnumCouponType.COUPON_CREDIT.getCode() || - type == EnumCouponType.COUPON_CREDIT_PARK.getCode()) { + if(type == EnumCouponType.COUPON_CREDIT.getCode() || + type == EnumCouponType.COUPON_CREDIT_PARK.getCode() || + type == EnumCouponType.COUPON_CREDIT_DOUYIN.getCode() + ) { return true; } return false; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java b/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java index f6fa467ff..b36ce7623 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java @@ -24,6 +24,7 @@ public enum EnumCouponType { COUPON_GIFT(12, "券礼包"), COUPON_CREDIT(50,"积分券"), COUPON_CREDIT_PARK(51,"积分停车券"), + COUPON_CREDIT_DOUYIN(55,"积分券"), CARD_MULTIMCH(100, "消费卡"), ;