From fabf3156245dc9f1ab125577930f69333a278199 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 7 Jun 2023 10:02:16 +0800 Subject: [PATCH] //coupon --- .../com/iformall/controller/market/WxCouponController.java | 3 ++- .../db/migration/V2023060500001_douyin_permission.sql | 1 + .../main/java/com/iformall/controller/WxCouponController.java | 3 ++- .../main/java/com/iformall/enums/EnumCouponChannelType.java | 1 + .../src/main/java/com/iformall/enums/EnumCouponType.java | 4 ++++ 5 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V2023060500001_douyin_permission.sql diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 13da18250..5b180dda9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -149,7 +149,8 @@ public class WxCouponController extends BaseController { EnumCouponType.COUPON_MULTIMCH.getCode(), EnumCouponType.COUPON_DOUYIN.getCode(), EnumCouponType.COUPON_PRESS.getCode(), - EnumCouponType.COUPON_PREORDER.getCode()}; + EnumCouponType.COUPON_PREORDER.getCode(), + EnumCouponType.COUPON_DOUYIN_GO_HOME.getCode()}; wxCoupon.setTypes(Arrays.asList(typeArray)); diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023060500001_douyin_permission.sql b/mallinkAdmin/src/main/resources/db/migration/V2023060500001_douyin_permission.sql new file mode 100644 index 000000000..59815d786 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2023060500001_douyin_permission.sql @@ -0,0 +1 @@ +INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (60201, '抖音到家券', 602, 'Y', NULL, 1, NULL, NULL, 'douyinToHomeCoupon', NULL, 0, 60201); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java index c2192cb92..4552007b5 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -102,7 +102,8 @@ public class WxCouponController extends BaseController { EnumCouponType.COUPON_MULTIMCH.getCode(), EnumCouponType.COUPON_DOUYIN.getCode(), EnumCouponType.COUPON_PRESS.getCode(), - EnumCouponType.COUPON_PREORDER.getCode()}; + EnumCouponType.COUPON_PREORDER.getCode(), + EnumCouponType.COUPON_DOUYIN_GO_HOME.getCode()}; wxCoupon.setTypes(Arrays.asList(typeArray)); wxCoupon.setMerchantId(getLoginBUser().getMerchantId()); diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCouponChannelType.java b/mallinkService/src/main/java/com/iformall/enums/EnumCouponChannelType.java index 059a3d221..500193bb8 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCouponChannelType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCouponChannelType.java @@ -153,6 +153,7 @@ public enum EnumCouponChannelType { codes.add(EnumCouponType.COUPON_DOUYIN.getCode()); codes.add(EnumCouponType.COUPON_DOUYIN_PLAT.getCode()); codes.add(EnumCouponType.COUPON_DOUYIN_BRAND.getCode()); + codes.add(EnumCouponType.COUPON_DOUYIN_GO_HOME.getCode()); } return codes; } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java b/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java index 19361ff86..ebeffcf20 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java @@ -32,6 +32,8 @@ public enum EnumCouponType { COUPON_DOUYIN_PLAT(67, "抖音集团平台券",true), COUPON_DOUYIN_BRAND(68, "抖音集团品牌券",true), + COUPON_DOUYIN_GO_HOME(69, "抖音到家券",true), + CARD_MULTIMCH(100, "消费卡",false), ; @@ -94,6 +96,8 @@ public enum EnumCouponType { // typeList.add(COUPON_CREDIT_DOUYIN.getCode()); typeList.add(COUPON_DOUYIN_PLAT.getCode()); typeList.add(COUPON_DOUYIN_BRAND.getCode()); + typeList.add(COUPON_DOUYIN_GO_HOME.getCode()); + return typeList; }