From 0953b84f9abc780530cc2fea4ed29ec5d480803d Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 20 Sep 2022 17:46:59 +0800 Subject: [PATCH] //coupontype --- .../src/main/java/com/iformall/utils/AppTest.java | 6 +++--- .../src/main/java/com/iformall/domain/po/OrderSnapshot.java | 6 +++--- .../src/main/java/com/iformall/domain/po/WxCoupon.java | 6 +++--- .../src/main/java/com/iformall/enums/EnumCouponType.java | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java index 7a70f58a2..2e661e826 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java +++ b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java @@ -101,9 +101,9 @@ public class AppTest { paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id // paramMap.put("userNumber","551612907794915328");//***会员Id546907706202185728 paramMap.put("userPhone","18872592633");//会员手机号 - paramMap.put("timeEnd","2022-09-20 17:24:00");//***积分抵扣时间 - paramMap.put("amount",-10000);//***积分 - paramMap.put("summary","再再扣你一万");// + paramMap.put("timeEnd","2022-09-20 17:37:00");//***积分抵扣时间 + paramMap.put("amount",1000000);//***积分 + paramMap.put("summary","恭喜你,获得了一百万");// /** * 参数加密并封装 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 4ab905789..0016605fd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/OrderSnapshot.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/OrderSnapshot.java @@ -287,9 +287,9 @@ public class OrderSnapshot extends TenantEntity { return false; } - if(type == EnumCouponType.COUPON_CREDIT.getCode() || - type == EnumCouponType.COUPON_CREDIT_PARK.getCode() || - type == EnumCouponType.COUPON_CREDIT_DOUYIN.getCode() + if(type == EnumCouponType.COUPON_CREDIT.getCode() + || type == EnumCouponType.COUPON_CREDIT_PARK.getCode() +// ||type == EnumCouponType.COUPON_CREDIT_DOUYIN.getCode() ) { return true; } 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 6d91a6055..76dd7bc43 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -417,9 +417,9 @@ public class WxCoupon extends TenantEntity { return false; } - if(type == EnumCouponType.COUPON_CREDIT.getCode() || - type == EnumCouponType.COUPON_CREDIT_PARK.getCode() || - type == EnumCouponType.COUPON_CREDIT_DOUYIN.getCode() + if(type == EnumCouponType.COUPON_CREDIT.getCode() + || type == EnumCouponType.COUPON_CREDIT_PARK.getCode() +// ||type == EnumCouponType.COUPON_CREDIT_DOUYIN.getCode() ) { return true; } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java b/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java index 7f96fd57e..708089701 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java @@ -24,7 +24,7 @@ public enum EnumCouponType { COUPON_GIFT(12, "券礼包"), COUPON_CREDIT(50,"积分券"), COUPON_CREDIT_PARK(51,"积分停车券"), - COUPON_CREDIT_DOUYIN(55,"抖音积分券"), +// COUPON_CREDIT_DOUYIN(55,"抖音积分券"), CARD_MULTIMCH(100, "消费卡"), ; @@ -67,7 +67,7 @@ public enum EnumCouponType { public static List getDouYinType(){ List typeList = new ArrayList<>(); typeList.add(COUPON_DOUYIN.getCode()); - typeList.add(COUPON_CREDIT_DOUYIN.getCode()); +// typeList.add(COUPON_CREDIT_DOUYIN.getCode()); return typeList; }