| @@ -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]'); | |||||
| @@ -95,6 +95,14 @@ public interface WxMerchantService { | |||||
| */ | */ | ||||
| List<WxMerchant> findList(WxMerchant record); | List<WxMerchant> findList(WxMerchant record); | ||||
| /** | |||||
| * 根据商管商户 | |||||
| * | |||||
| * @param tenantEntity | |||||
| * @return | |||||
| */ | |||||
| List<WxMerchant> findAdminList(TenantEntity tenantEntity); | |||||
| /** | /** | ||||
| * 查询商户列表 | * 查询商户列表 | ||||
| * @param tenantEntity | * @param tenantEntity | ||||
| @@ -275,6 +275,16 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| return wxMerchantMapper.findList(record); | return wxMerchantMapper.findList(record); | ||||
| } | } | ||||
| @Override | |||||
| public List<WxMerchant> findAdminList(TenantEntity tenantEntity) { | |||||
| WxMerchant wxMerchant = new WxMerchant(); | |||||
| wxMerchant.updateTenantInfo(tenantEntity); | |||||
| wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); | |||||
| wxMerchant.setIsAdmin(EnumMerchantAdmin.PUBLIC_ADMIN.getCode()); | |||||
| List<WxMerchant> list = findList(wxMerchant); | |||||
| return list; | |||||
| } | |||||
| @Override | @Override | ||||
| public List<WxMerchantSimpleVo> findList(TenantEntity tenantEntity) { | public List<WxMerchantSimpleVo> findList(TenantEntity tenantEntity) { | ||||
| WxMerchant wxMerchant = new WxMerchant(); | WxMerchant wxMerchant = new WxMerchant(); | ||||