From 8482951210f2d7f2cd5c03cd88bb18b241dc4f38 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 16 Nov 2022 17:31:27 +0800 Subject: [PATCH] //merchant --- .../migration/V2022111600001__add_mall_permission.sql | 4 ++++ .../java/com/iformall/service/WxMerchantService.java | 8 ++++++++ .../iformall/service/impl/WxMerchantServiceImpl.java | 10 ++++++++++ 3 files changed, 22 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V2022111600001__add_mall_permission.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V2022111600001__add_mall_permission.sql b/mallinkAdmin/src/main/resources/db/migration/V2022111600001__add_mall_permission.sql new file mode 100644 index 000000000..116a0096b --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2022111600001__add_mall_permission.sql @@ -0,0 +1,4 @@ +INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (648, '抖音平台券', 602, 'Y', NULL, 1, NULL, NULL, 'douyinPlatCoupon', NULL, 0, 648); +INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (649, '抖音品牌券', 602, 'Y', NULL, 1, NULL, NULL, 'douyinBrandCoupon', NULL, 0, 649); + +INSERT INTO `mallink`.`mall_sale_type`(`id`, `name`, `type`, `period`, `menus`) VALUES (101, '抖音集团版', 101, 12, '[1, 2, 4, 5, 6, 50, 105, 110, 201, 205, 202, 211, 212, 221, 222, 223, 224, 251, 409, 410, 411, 416, 500, 502, 504, 505, 506, 507, 511, 512, 521, 522, 523, 591, 592, 595, 601, 602, 605, 610, 615, 622, 648, 649, 676, 711, 901, 902, 904, 907, 61501, 61502]'); diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 4592d2fab..719d6702f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -95,6 +95,14 @@ public interface WxMerchantService { */ List findList(WxMerchant record); + /** + * 根据商管商户 + * + * @param tenantEntity + * @return + */ + List findAdminList(TenantEntity tenantEntity); + /** * 查询商户列表 * @param tenantEntity diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index c8e3533ed..2ea1bc34f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -275,6 +275,16 @@ public class WxMerchantServiceImpl implements WxMerchantService { return wxMerchantMapper.findList(record); } + @Override + public List findAdminList(TenantEntity tenantEntity) { + WxMerchant wxMerchant = new WxMerchant(); + wxMerchant.updateTenantInfo(tenantEntity); + wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); + wxMerchant.setIsAdmin(EnumMerchantAdmin.PUBLIC_ADMIN.getCode()); + List list = findList(wxMerchant); + return list; + } + @Override public List findList(TenantEntity tenantEntity) { WxMerchant wxMerchant = new WxMerchant();