From 4fe01488d6321a7e2eb845a014eac07d19b9d12d Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 7 Jun 2023 14:53:27 +0800 Subject: [PATCH] //coupon --- .../com/iformall/controller/market/WxCouponController.java | 3 ++- .../db/migration/V2023060500001_douyin_permission.sql | 2 ++ .../main/java/com/iformall/controller/WxCouponController.java | 3 ++- .../main/java/com/iformall/enums/EnumCouponChannelType.java | 1 + .../src/main/java/com/iformall/enums/EnumCouponType.java | 2 ++ 5 files changed, 9 insertions(+), 2 deletions(-) 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 5b180dda9..21201527d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -150,7 +150,8 @@ public class WxCouponController extends BaseController { EnumCouponType.COUPON_DOUYIN.getCode(), EnumCouponType.COUPON_PRESS.getCode(), EnumCouponType.COUPON_PREORDER.getCode(), - EnumCouponType.COUPON_DOUYIN_GO_HOME.getCode()}; + EnumCouponType.COUPON_DOUYIN_GO_HOME.getCode(), + EnumCouponType.COUPON_DOUYIN_DAIJIN.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 index 59815d786..ad9c345de 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V2023060500001_douyin_permission.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V2023060500001_douyin_permission.sql @@ -1 +1,3 @@ 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); + +INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (60202, '抖音代金券', 602, 'Y', NULL, 1, NULL, NULL, 'douyinVoucherCoupon', NULL, 0, 60202); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java index 4552007b5..606458238 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -103,7 +103,8 @@ public class WxCouponController extends BaseController { EnumCouponType.COUPON_DOUYIN.getCode(), EnumCouponType.COUPON_PRESS.getCode(), EnumCouponType.COUPON_PREORDER.getCode(), - EnumCouponType.COUPON_DOUYIN_GO_HOME.getCode()}; + EnumCouponType.COUPON_DOUYIN_GO_HOME.getCode(), + EnumCouponType.COUPON_DOUYIN_DAIJIN.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 500193bb8..12b85cad0 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCouponChannelType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCouponChannelType.java @@ -154,6 +154,7 @@ public enum EnumCouponChannelType { codes.add(EnumCouponType.COUPON_DOUYIN_PLAT.getCode()); codes.add(EnumCouponType.COUPON_DOUYIN_BRAND.getCode()); codes.add(EnumCouponType.COUPON_DOUYIN_GO_HOME.getCode()); + codes.add(EnumCouponType.COUPON_DOUYIN_DAIJIN.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 ebeffcf20..1e4c24c26 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java @@ -33,6 +33,7 @@ public enum EnumCouponType { COUPON_DOUYIN_BRAND(68, "抖音集团品牌券",true), COUPON_DOUYIN_GO_HOME(69, "抖音到家券",true), + COUPON_DOUYIN_DAIJIN(70, "抖音代金券",true), CARD_MULTIMCH(100, "消费卡",false), ; @@ -97,6 +98,7 @@ public enum EnumCouponType { typeList.add(COUPON_DOUYIN_PLAT.getCode()); typeList.add(COUPON_DOUYIN_BRAND.getCode()); typeList.add(COUPON_DOUYIN_GO_HOME.getCode()); + typeList.add(COUPON_DOUYIN_DAIJIN.getCode()); return typeList; }