From e6b3b73b642284789cff42471e8f9f65210d7337 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Fri, 17 Mar 2023 23:43:02 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E8=87=AA=E5=AE=9A=E4=B9=89=E4=B8=9A?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invest/InvestCustomerController.java | 2 +- .../invest/InvestOperateRecordController.java | 4 +- .../db/migration/V20230323000001_business.sql | 461 ++++++++++++++++++ .../config/BaseMyBatisConfiguration.java | 7 + .../com/iformall/domain/po/WxBusiness.java | 3 + .../com/iformall/mapper/WxBusinessMapper.java | 6 +- .../iformall/service/WxBusinessService.java | 6 +- .../service/impl/WxBusinessServiceImpl.java | 17 +- .../service/impl/WxChartServiceImpl.java | 4 +- .../service/impl/WxMerchantServiceImpl.java | 2 +- .../service/impl/WxShopServiceImpl.java | 10 +- .../service/invest/InvestBizService.java | 6 +- .../invest/impl/InvestBaseServiceImpl.java | 7 +- .../invest/impl/InvestBizServiceImpl.java | 24 +- .../impl/InvestCustomerServiceImpl.java | 4 +- .../resources/mapper/WxBusinessMapper.xml | 25 +- 16 files changed, 547 insertions(+), 41 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java index eb7f78801..671453f30 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java @@ -104,7 +104,7 @@ public class InvestCustomerController extends InvestBaseController{ @PostMapping(value = "/importCustomer", consumes = "multipart/*", headers = "content-type=multipart/form-data") @SystemControllerLog(description = "招商管理-导入客户信息") public InvestResultData importCustomer(@RequestParam("file") MultipartFile file) { - return importData(file, p -> investBizService.importCustomer(p)); + return importData(file, p -> investBizService.importCustomer(this.getTenantInfo(),p)); } @GetMapping("/queryTemplateCount") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java index 8e42fc21e..f70554495 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java @@ -52,7 +52,7 @@ public class InvestOperateRecordController extends InvestBaseController { */ @GetMapping("/listById") public InvestResultData> listById(InvestOperateRecordQuery params) { - return execute(params, p -> bizService.findOperateListById(p)); + return execute(params, p -> bizService.findOperateListById(this.getTenantInfo(),p)); } /** @@ -60,7 +60,7 @@ public class InvestOperateRecordController extends InvestBaseController { */ @GetMapping("/info") public InvestResultData> info(InvestOperateRecordQuery params) { - return execute(params, p -> bizService.findOperateById(p)); + return execute(params, p -> bizService.findOperateById(this.getTenantInfo(),p)); } /** diff --git a/mallinkAdmin/src/main/resources/db/migration/V20230323000001_business.sql b/mallinkAdmin/src/main/resources/db/migration/V20230323000001_business.sql index 65436843d..8c6d47f47 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V20230323000001_business.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V20230323000001_business.sql @@ -4,6 +4,467 @@ update wx_tags set is_del = 1 where type_id in (14,17); alter table wx_business add column final_tenant_id varchar(5) comment ''; +alter table wx_business add column is_system int(1) not null default 0 comment '是否系统内置1-是,0-否'; + wx_business 主见改自增 +create table wx_business_0 like wx_business; +create table wx_business_1 like wx_business; +create table wx_business_2 like wx_business; +create table wx_business_3 like wx_business; +create table wx_business_4 like wx_business; +create table wx_business_5 like wx_business; +create table wx_business_6 like wx_business; +create table wx_business_7 like wx_business; +create table wx_business_8 like wx_business; +create table wx_business_9 like wx_business; +create table wx_business_10 like wx_business; +create table wx_business_11 like wx_business; +create table wx_business_12 like wx_business; +create table wx_business_13 like wx_business; +create table wx_business_14 like wx_business; +create table wx_business_15 like wx_business; +create table wx_business_16 like wx_business; +create table wx_business_17 like wx_business; +create table wx_business_18 like wx_business; +create table wx_business_19 like wx_business; +create table wx_business_20 like wx_business; +create table wx_business_21 like wx_business; +create table wx_business_22 like wx_business; +create table wx_business_23 like wx_business; +create table wx_business_24 like wx_business; +create table wx_business_25 like wx_business; +create table wx_business_26 like wx_business; +create table wx_business_27 like wx_business; +create table wx_business_28 like wx_business; +create table wx_business_29 like wx_business; +create table wx_business_30 like wx_business; +create table wx_business_31 like wx_business; +create table wx_business_32 like wx_business; +create table wx_business_33 like wx_business; +create table wx_business_34 like wx_business; +create table wx_business_35 like wx_business; +create table wx_business_36 like wx_business; +create table wx_business_37 like wx_business; +create table wx_business_38 like wx_business; +create table wx_business_39 like wx_business; +create table wx_business_40 like wx_business; +create table wx_business_41 like wx_business; +create table wx_business_42 like wx_business; +create table wx_business_43 like wx_business; +create table wx_business_44 like wx_business; +create table wx_business_45 like wx_business; +create table wx_business_46 like wx_business; +create table wx_business_47 like wx_business; +create table wx_business_48 like wx_business; +create table wx_business_49 like wx_business; +create table wx_business_50 like wx_business; +create table wx_business_51 like wx_business; +create table wx_business_52 like wx_business; +create table wx_business_53 like wx_business; +create table wx_business_54 like wx_business; +create table wx_business_55 like wx_business; +create table wx_business_56 like wx_business; +create table wx_business_57 like wx_business; +create table wx_business_58 like wx_business; +create table wx_business_59 like wx_business; +create table wx_business_60 like wx_business; +create table wx_business_61 like wx_business; +create table wx_business_62 like wx_business; +create table wx_business_63 like wx_business; +create table wx_business_64 like wx_business; +create table wx_business_65 like wx_business; +create table wx_business_66 like wx_business; +create table wx_business_67 like wx_business; +create table wx_business_68 like wx_business; +create table wx_business_69 like wx_business; +create table wx_business_70 like wx_business; +create table wx_business_71 like wx_business; +create table wx_business_72 like wx_business; +create table wx_business_73 like wx_business; +create table wx_business_74 like wx_business; +create table wx_business_75 like wx_business; +create table wx_business_76 like wx_business; +create table wx_business_77 like wx_business; +create table wx_business_78 like wx_business; +create table wx_business_79 like wx_business; +create table wx_business_80 like wx_business; +create table wx_business_81 like wx_business; +create table wx_business_82 like wx_business; +create table wx_business_83 like wx_business; +create table wx_business_84 like wx_business; +create table wx_business_85 like wx_business; +create table wx_business_86 like wx_business; +create table wx_business_87 like wx_business; +create table wx_business_88 like wx_business; +create table wx_business_89 like wx_business; +create table wx_business_90 like wx_business; +create table wx_business_91 like wx_business; +create table wx_business_92 like wx_business; +create table wx_business_93 like wx_business; +create table wx_business_94 like wx_business; +create table wx_business_95 like wx_business; +create table wx_business_96 like wx_business; +create table wx_business_97 like wx_business; +create table wx_business_98 like wx_business; +create table wx_business_99 like wx_business; + + +INSERT INTO `wx_business_89` (`id`, `title`, `type`, `create_date`, `update_date`, `final_tenant_id`, `is_system`) +VALUES + (1,'餐饮',1,'2018-08-08 17:58:54','2018-08-20 19:07:49','789',0), + (2,'娱乐',1,'2018-08-10 22:13:38','2018-08-23 15:57:54','789',0), + (3,'服饰',1,'2018-08-10 22:14:14','2018-08-23 15:57:56','789',0), + (4,'亲子',1,'2018-08-10 22:15:00','2018-08-23 15:57:57','789',0), + (5,'超市',1,'2018-08-10 22:15:17','2018-08-23 15:57:58','789',0), + (6,'其他',1,'2028-08-10 22:15:17','2023-03-17 22:14:21','789',1), + (7,'美妆',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','789',0), + (8,'珠宝',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','789',0), + (9,'服务',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','789',0), + (10,'家居',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','789',0), + (11,'数码家电',1,'2019-08-01 16:42:40','2019-08-01 16:42:40','789',0); + +INSERT INTO `wx_business_3` (`id`, `title`, `type`, `create_date`, `update_date`, `final_tenant_id`, `is_system`) +VALUES + (1,'餐饮',1,'2018-08-08 17:58:54','2018-08-20 19:07:49','1003',0), + (2,'娱乐',1,'2018-08-10 22:13:38','2018-08-23 15:57:54','1003',0), + (3,'服饰',1,'2018-08-10 22:14:14','2018-08-23 15:57:56','1003',0), + (4,'亲子',1,'2018-08-10 22:15:00','2018-08-23 15:57:57','1003',0), + (5,'超市',1,'2018-08-10 22:15:17','2018-08-23 15:57:58','1003',0), + (6,'其他',1,'2028-08-10 22:15:17','2023-03-17 22:14:21','1003',1), + (7,'美妆',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1003',0), + (8,'珠宝',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1003',0), + (9,'服务',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1003',0), + (10,'家居',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1003',0), + (11,'数码家电',1,'2019-08-01 16:42:40','2019-08-01 16:42:40','1003',0); + +INSERT INTO `wx_business_28` (`id`, `title`, `type`, `create_date`, `update_date`, `final_tenant_id`, `is_system`) +VALUES + (1,'餐饮',1,'2018-08-08 17:58:54','2018-08-20 19:07:49','1028',0), + (2,'娱乐',1,'2018-08-10 22:13:38','2018-08-23 15:57:54','1028',0), + (3,'服饰',1,'2018-08-10 22:14:14','2018-08-23 15:57:56','1028',0), + (4,'亲子',1,'2018-08-10 22:15:00','2018-08-23 15:57:57','1028',0), + (5,'超市',1,'2018-08-10 22:15:17','2018-08-23 15:57:58','1028',0), + (6,'其他',1,'2028-08-10 22:15:17','2023-03-17 22:14:21','1028',1), + (7,'美妆',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1028',0), + (8,'珠宝',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1028',0), + (9,'服务',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1028',0), + (10,'家居',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1028',0), + (11,'数码家电',1,'2019-08-01 16:42:40','2019-08-01 16:42:40','1028',0); + +INSERT INTO `wx_business_9` (`id`, `title`, `type`, `create_date`, `update_date`, `final_tenant_id`, `is_system`) +VALUES + (1,'餐饮',1,'2018-08-08 17:58:54','2018-08-20 19:07:49','1009',0), + (2,'娱乐',1,'2018-08-10 22:13:38','2018-08-23 15:57:54','1009',0), + (3,'服饰',1,'2018-08-10 22:14:14','2018-08-23 15:57:56','1009',0), + (4,'亲子',1,'2018-08-10 22:15:00','2018-08-23 15:57:57','1009',0), + (5,'超市',1,'2018-08-10 22:15:17','2018-08-23 15:57:58','1009',0), + (6,'其他',1,'2028-08-10 22:15:17','2023-03-17 22:14:21','1009',1), + (7,'美妆',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1009',0), + (8,'珠宝',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1009',0), + (9,'服务',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1009',0), + (10,'家居',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1009',0), + (11,'数码家电',1,'2019-08-01 16:42:40','2019-08-01 16:42:40','1009',0); + +INSERT INTO `wx_business_10` (`id`, `title`, `type`, `create_date`, `update_date`, `final_tenant_id`, `is_system`) +VALUES + (1,'餐饮',1,'2018-08-08 17:58:54','2018-08-20 19:07:49','1010',0), + (2,'娱乐',1,'2018-08-10 22:13:38','2018-08-23 15:57:54','1010',0), + (3,'服饰',1,'2018-08-10 22:14:14','2018-08-23 15:57:56','1010',0), + (4,'亲子',1,'2018-08-10 22:15:00','2018-08-23 15:57:57','1010',0), + (5,'超市',1,'2018-08-10 22:15:17','2018-08-23 15:57:58','1010',0), + (6,'其他',1,'2028-08-10 22:15:17','2023-03-17 22:14:21','1010',1), + (7,'美妆',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1010',0), + (8,'珠宝',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1010',0), + (9,'服务',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1010',0), + (10,'家居',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1010',0), + (11,'数码家电',1,'2019-08-01 16:42:40','2019-08-01 16:42:40','1010',0); + +INSERT INTO `wx_business_12` (`id`, `title`, `type`, `create_date`, `update_date`, `final_tenant_id`, `is_system`) +VALUES + (1,'餐饮',1,'2018-08-08 17:58:54','2018-08-20 19:07:49','1012',0), + (2,'娱乐',1,'2018-08-10 22:13:38','2018-08-23 15:57:54','1012',0), + (3,'服饰',1,'2018-08-10 22:14:14','2018-08-23 15:57:56','1012',0), + (4,'亲子',1,'2018-08-10 22:15:00','2018-08-23 15:57:57','1012',0), + (5,'超市',1,'2018-08-10 22:15:17','2018-08-23 15:57:58','1012',0), + (6,'其他',1,'2028-08-10 22:15:17','2023-03-17 22:14:21','1012',1), + (7,'美妆',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1012',0), + (8,'珠宝',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1012',0), + (9,'服务',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1012',0), + (10,'家居',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1012',0), + (11,'数码家电',1,'2019-08-01 16:42:40','2019-08-01 16:42:40','1012',0); + + +INSERT INTO `wx_business_13` (`id`, `title`, `type`, `create_date`, `update_date`, `final_tenant_id`, `is_system`) +VALUES + (1,'餐饮',1,'2018-08-08 17:58:54','2018-08-20 19:07:49','1013',0), + (2,'娱乐',1,'2018-08-10 22:13:38','2018-08-23 15:57:54','1013',0), + (3,'服饰',1,'2018-08-10 22:14:14','2018-08-23 15:57:56','1013',0), + (4,'亲子',1,'2018-08-10 22:15:00','2018-08-23 15:57:57','1013',0), + (5,'超市',1,'2018-08-10 22:15:17','2018-08-23 15:57:58','1013',0), + (6,'其他',1,'2028-08-10 22:15:17','2023-03-17 22:14:21','1013',1), + (7,'美妆',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1013',0), + (8,'珠宝',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1013',0), + (9,'服务',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1013',0), + (10,'家居',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1013',0), + (11,'数码家电',1,'2019-08-01 16:42:40','2019-08-01 16:42:40','1013',0); + +INSERT INTO `wx_business_19` (`id`, `title`, `type`, `create_date`, `update_date`, `final_tenant_id`, `is_system`) +VALUES + (1,'餐饮',1,'2018-08-08 17:58:54','2018-08-20 19:07:49','1019',0), + (2,'娱乐',1,'2018-08-10 22:13:38','2018-08-23 15:57:54','1019',0), + (3,'服饰',1,'2018-08-10 22:14:14','2018-08-23 15:57:56','1019',0), + (4,'亲子',1,'2018-08-10 22:15:00','2018-08-23 15:57:57','1019',0), + (5,'超市',1,'2018-08-10 22:15:17','2018-08-23 15:57:58','1019',0), + (6,'其他',1,'2028-08-10 22:15:17','2023-03-17 22:14:21','1019',1), + (7,'美妆',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1019',0), + (8,'珠宝',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1019',0), + (9,'服务',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1019',0), + (10,'家居',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1019',0), + (11,'数码家电',1,'2019-08-01 16:42:40','2019-08-01 16:42:40','1019',0); + +INSERT INTO `wx_business_24` (`id`, `title`, `type`, `create_date`, `update_date`, `final_tenant_id`, `is_system`) +VALUES + (1,'餐饮',1,'2018-08-08 17:58:54','2018-08-20 19:07:49','1024',0), + (2,'娱乐',1,'2018-08-10 22:13:38','2018-08-23 15:57:54','1024',0), + (3,'服饰',1,'2018-08-10 22:14:14','2018-08-23 15:57:56','1024',0), + (4,'亲子',1,'2018-08-10 22:15:00','2018-08-23 15:57:57','1024',0), + (5,'超市',1,'2018-08-10 22:15:17','2018-08-23 15:57:58','1024',0), + (6,'其他',1,'2028-08-10 22:15:17','2023-03-17 22:14:21','1024',1), + (7,'美妆',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1024',0), + (8,'珠宝',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1024',0), + (9,'服务',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1024',0), + (10,'家居',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1024',0), + (11,'数码家电',1,'2019-08-01 16:42:40','2019-08-01 16:42:40','1024',0); + +INSERT INTO `wx_business_25` (`id`, `title`, `type`, `create_date`, `update_date`, `final_tenant_id`, `is_system`) +VALUES + (1,'餐饮',1,'2018-08-08 17:58:54','2018-08-20 19:07:49','1025',0), + (2,'娱乐',1,'2018-08-10 22:13:38','2018-08-23 15:57:54','1025',0), + (3,'服饰',1,'2018-08-10 22:14:14','2018-08-23 15:57:56','1025',0), + (4,'亲子',1,'2018-08-10 22:15:00','2018-08-23 15:57:57','1025',0), + (5,'超市',1,'2018-08-10 22:15:17','2018-08-23 15:57:58','1025',0), + (6,'其他',1,'2028-08-10 22:15:17','2023-03-17 22:14:21','1025',1), + (7,'美妆',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1025',0), + (8,'珠宝',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1025',0), + (9,'服务',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1025',0), + (10,'家居',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1025',0), + (11,'数码家电',1,'2019-08-01 16:42:40','2019-08-01 16:42:40','1025',0); + +INSERT INTO `wx_business_29` (`id`, `title`, `type`, `create_date`, `update_date`, `final_tenant_id`, `is_system`) +VALUES + (1,'餐饮',1,'2018-08-08 17:58:54','2018-08-20 19:07:49','1029',0), + (2,'娱乐',1,'2018-08-10 22:13:38','2018-08-23 15:57:54','1029',0), + (3,'服饰',1,'2018-08-10 22:14:14','2018-08-23 15:57:56','1029',0), + (4,'亲子',1,'2018-08-10 22:15:00','2018-08-23 15:57:57','1029',0), + (5,'超市',1,'2018-08-10 22:15:17','2018-08-23 15:57:58','1029',0), + (6,'其他',1,'2028-08-10 22:15:17','2023-03-17 22:14:21','1029',1), + (7,'美妆',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1029',0), + (8,'珠宝',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1029',0), + (9,'服务',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1029',0), + (10,'家居',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1029',0), + (11,'数码家电',1,'2019-08-01 16:42:40','2019-08-01 16:42:40','1029',0); + +INSERT INTO `wx_business_37` (`id`, `title`, `type`, `create_date`, `update_date`, `final_tenant_id`, `is_system`) +VALUES + (1,'餐饮',1,'2018-08-08 17:58:54','2018-08-20 19:07:49','1037',0), + (2,'娱乐',1,'2018-08-10 22:13:38','2018-08-23 15:57:54','1037',0), + (3,'服饰',1,'2018-08-10 22:14:14','2018-08-23 15:57:56','1037',0), + (4,'亲子',1,'2018-08-10 22:15:00','2018-08-23 15:57:57','1037',0), + (5,'超市',1,'2018-08-10 22:15:17','2018-08-23 15:57:58','1037',0), + (6,'其他',1,'2028-08-10 22:15:17','2023-03-17 22:14:21','1037',1), + (7,'美妆',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1037',0), + (8,'珠宝',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1037',0), + (9,'服务',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1037',0), + (10,'家居',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1037',0), + (11,'数码家电',1,'2019-08-01 16:42:40','2019-08-01 16:42:40','1037',0); + +INSERT INTO `wx_business_38` (`id`, `title`, `type`, `create_date`, `update_date`, `final_tenant_id`, `is_system`) +VALUES + (1,'餐饮',1,'2018-08-08 17:58:54','2018-08-20 19:07:49','1038',0), + (2,'娱乐',1,'2018-08-10 22:13:38','2018-08-23 15:57:54','1038',0), + (3,'服饰',1,'2018-08-10 22:14:14','2018-08-23 15:57:56','1038',0), + (4,'亲子',1,'2018-08-10 22:15:00','2018-08-23 15:57:57','1038',0), + (5,'超市',1,'2018-08-10 22:15:17','2018-08-23 15:57:58','1038',0), + (6,'其他',1,'2028-08-10 22:15:17','2023-03-17 22:14:21','1038',1), + (7,'美妆',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1038',0), + (8,'珠宝',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1038',0), + (9,'服务',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1038',0), + (10,'家居',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1038',0), + (11,'数码家电',1,'2019-08-01 16:42:40','2019-08-01 16:42:40','1038',0); + +INSERT INTO `wx_business_39` (`id`, `title`, `type`, `create_date`, `update_date`, `final_tenant_id`, `is_system`) +VALUES + (1,'餐饮',1,'2018-08-08 17:58:54','2018-08-20 19:07:49','1039',0), + (2,'娱乐',1,'2018-08-10 22:13:38','2018-08-23 15:57:54','1039',0), + (3,'服饰',1,'2018-08-10 22:14:14','2018-08-23 15:57:56','1039',0), + (4,'亲子',1,'2018-08-10 22:15:00','2018-08-23 15:57:57','1039',0), + (5,'超市',1,'2018-08-10 22:15:17','2018-08-23 15:57:58','1039',0), + (6,'其他',1,'2028-08-10 22:15:17','2023-03-17 22:14:21','1039',1), + (7,'美妆',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1039',0), + (8,'珠宝',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1039',0), + (9,'服务',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1039',0), + (10,'家居',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1039',0), + (11,'数码家电',1,'2019-08-01 16:42:40','2019-08-01 16:42:40','1039',0); + +INSERT INTO `wx_business_40` (`id`, `title`, `type`, `create_date`, `update_date`, `final_tenant_id`, `is_system`) +VALUES + (1,'餐饮',1,'2018-08-08 17:58:54','2018-08-20 19:07:49','1040',0), + (2,'娱乐',1,'2018-08-10 22:13:38','2018-08-23 15:57:54','1040',0), + (3,'服饰',1,'2018-08-10 22:14:14','2018-08-23 15:57:56','1040',0), + (4,'亲子',1,'2018-08-10 22:15:00','2018-08-23 15:57:57','1040',0), + (5,'超市',1,'2018-08-10 22:15:17','2018-08-23 15:57:58','1040',0), + (6,'其他',1,'2028-08-10 22:15:17','2023-03-17 22:14:21','1040',1), + (7,'美妆',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1040',0), + (8,'珠宝',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1040',0), + (9,'服务',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1040',0), + (10,'家居',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1040',0), + (11,'数码家电',1,'2019-08-01 16:42:40','2019-08-01 16:42:40','1040',0); + +INSERT INTO `wx_business_42` (`id`, `title`, `type`, `create_date`, `update_date`, `final_tenant_id`, `is_system`) +VALUES + (1,'餐饮',1,'2018-08-08 17:58:54','2018-08-20 19:07:49','1042',0), + (2,'娱乐',1,'2018-08-10 22:13:38','2018-08-23 15:57:54','1042',0), + (3,'服饰',1,'2018-08-10 22:14:14','2018-08-23 15:57:56','1042',0), + (4,'亲子',1,'2018-08-10 22:15:00','2018-08-23 15:57:57','1042',0), + (5,'超市',1,'2018-08-10 22:15:17','2018-08-23 15:57:58','1042',0), + (6,'其他',1,'2028-08-10 22:15:17','2023-03-17 22:14:21','1042',1), + (7,'美妆',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1042',0), + (8,'珠宝',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1042',0), + (9,'服务',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1042',0), + (10,'家居',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1042',0), + (11,'数码家电',1,'2019-08-01 16:42:40','2019-08-01 16:42:40','1042',0); + +INSERT INTO `wx_business_43` (`id`, `title`, `type`, `create_date`, `update_date`, `final_tenant_id`, `is_system`) +VALUES + (1,'餐饮',1,'2018-08-08 17:58:54','2018-08-20 19:07:49','1043',0), + (2,'娱乐',1,'2018-08-10 22:13:38','2018-08-23 15:57:54','1043',0), + (3,'服饰',1,'2018-08-10 22:14:14','2018-08-23 15:57:56','1043',0), + (4,'亲子',1,'2018-08-10 22:15:00','2018-08-23 15:57:57','1043',0), + (5,'超市',1,'2018-08-10 22:15:17','2018-08-23 15:57:58','1043',0), + (6,'其他',1,'2028-08-10 22:15:17','2023-03-17 22:14:21','1043',1), + (7,'美妆',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1043',0), + (8,'珠宝',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1043',0), + (9,'服务',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1043',0), + (10,'家居',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1043',0), + (11,'数码家电',1,'2019-08-01 16:42:40','2019-08-01 16:42:40','1043',0); + +INSERT INTO `wx_business_44` (`id`, `title`, `type`, `create_date`, `update_date`, `final_tenant_id`, `is_system`) +VALUES + (1,'餐饮',1,'2018-08-08 17:58:54','2018-08-20 19:07:49','1044',0), + (2,'娱乐',1,'2018-08-10 22:13:38','2018-08-23 15:57:54','1044',0), + (3,'服饰',1,'2018-08-10 22:14:14','2018-08-23 15:57:56','1044',0), + (4,'亲子',1,'2018-08-10 22:15:00','2018-08-23 15:57:57','1044',0), + (5,'超市',1,'2018-08-10 22:15:17','2018-08-23 15:57:58','1044',0), + (6,'其他',1,'2028-08-10 22:15:17','2023-03-17 22:14:21','1044',1), + (7,'美妆',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1044',0), + (8,'珠宝',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1044',0), + (9,'服务',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1044',0), + (10,'家居',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1044',0), + (11,'数码家电',1,'2019-08-01 16:42:40','2019-08-01 16:42:40','1044',0); + +INSERT INTO `wx_business_45` (`id`, `title`, `type`, `create_date`, `update_date`, `final_tenant_id`, `is_system`) +VALUES + (1,'餐饮',1,'2018-08-08 17:58:54','2018-08-20 19:07:49','1045',0), + (2,'娱乐',1,'2018-08-10 22:13:38','2018-08-23 15:57:54','1045',0), + (3,'服饰',1,'2018-08-10 22:14:14','2018-08-23 15:57:56','1045',0), + (4,'亲子',1,'2018-08-10 22:15:00','2018-08-23 15:57:57','1045',0), + (5,'超市',1,'2018-08-10 22:15:17','2018-08-23 15:57:58','1045',0), + (6,'其他',1,'2028-08-10 22:15:17','2023-03-17 22:14:21','1045',1), + (7,'美妆',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1045',0), + (8,'珠宝',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1045',0), + (9,'服务',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1045',0), + (10,'家居',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1045',0), + (11,'数码家电',1,'2019-08-01 16:42:40','2019-08-01 16:42:40','1045',0); + +INSERT INTO `wx_business_46` (`id`, `title`, `type`, `create_date`, `update_date`, `final_tenant_id`, `is_system`) +VALUES + (1,'餐饮',1,'2018-08-08 17:58:54','2018-08-20 19:07:49','1046',0), + (2,'娱乐',1,'2018-08-10 22:13:38','2018-08-23 15:57:54','1046',0), + (3,'服饰',1,'2018-08-10 22:14:14','2018-08-23 15:57:56','1046',0), + (4,'亲子',1,'2018-08-10 22:15:00','2018-08-23 15:57:57','1046',0), + (5,'超市',1,'2018-08-10 22:15:17','2018-08-23 15:57:58','1046',0), + (6,'其他',1,'2028-08-10 22:15:17','2023-03-17 22:14:21','1046',1), + (7,'美妆',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1046',0), + (8,'珠宝',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1046',0), + (9,'服务',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1046',0), + (10,'家居',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1046',0), + (11,'数码家电',1,'2019-08-01 16:42:40','2019-08-01 16:42:40','1046',0); + +INSERT INTO `wx_business_48` (`id`, `title`, `type`, `create_date`, `update_date`, `final_tenant_id`, `is_system`) +VALUES + (1,'餐饮',1,'2018-08-08 17:58:54','2018-08-20 19:07:49','1048',0), + (2,'娱乐',1,'2018-08-10 22:13:38','2018-08-23 15:57:54','1048',0), + (3,'服饰',1,'2018-08-10 22:14:14','2018-08-23 15:57:56','1048',0), + (4,'亲子',1,'2018-08-10 22:15:00','2018-08-23 15:57:57','1048',0), + (5,'超市',1,'2018-08-10 22:15:17','2018-08-23 15:57:58','1048',0), + (6,'其他',1,'2028-08-10 22:15:17','2023-03-17 22:14:21','1048',1), + (7,'美妆',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1048',0), + (8,'珠宝',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1048',0), + (9,'服务',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1048',0), + (10,'家居',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1048',0), + (11,'数码家电',1,'2019-08-01 16:42:40','2019-08-01 16:42:40','1048',0); + +INSERT INTO `wx_business_52` (`id`, `title`, `type`, `create_date`, `update_date`, `final_tenant_id`, `is_system`) +VALUES + (1,'餐饮',1,'2018-08-08 17:58:54','2018-08-20 19:07:49','1052',0), + (2,'娱乐',1,'2018-08-10 22:13:38','2018-08-23 15:57:54','1052',0), + (3,'服饰',1,'2018-08-10 22:14:14','2018-08-23 15:57:56','1052',0), + (4,'亲子',1,'2018-08-10 22:15:00','2018-08-23 15:57:57','1052',0), + (5,'超市',1,'2018-08-10 22:15:17','2018-08-23 15:57:58','1052',0), + (6,'其他',1,'2028-08-10 22:15:17','2023-03-17 22:14:21','1052',1), + (7,'美妆',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1052',0), + (8,'珠宝',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1052',0), + (9,'服务',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1052',0), + (10,'家居',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1052',0), + (11,'数码家电',1,'2019-08-01 16:42:40','2019-08-01 16:42:40','1052',0); + +INSERT INTO `wx_business_50` (`id`, `title`, `type`, `create_date`, `update_date`, `final_tenant_id`, `is_system`) +VALUES + (1,'餐饮',1,'2018-08-08 17:58:54','2018-08-20 19:07:49','1050',0), + (2,'娱乐',1,'2018-08-10 22:13:38','2018-08-23 15:57:54','1050',0), + (3,'服饰',1,'2018-08-10 22:14:14','2018-08-23 15:57:56','1050',0), + (4,'亲子',1,'2018-08-10 22:15:00','2018-08-23 15:57:57','1050',0), + (5,'超市',1,'2018-08-10 22:15:17','2018-08-23 15:57:58','1050',0), + (6,'其他',1,'2028-08-10 22:15:17','2023-03-17 22:14:21','1050',1), + (7,'美妆',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1050',0), + (8,'珠宝',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1050',0), + (9,'服务',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1050',0), + (10,'家居',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1050',0), + (11,'数码家电',1,'2019-08-01 16:42:40','2019-08-01 16:42:40','1050',0); + +INSERT INTO `wx_business_62` (`id`, `title`, `type`, `create_date`, `update_date`, `final_tenant_id`, `is_system`) +VALUES + (1,'餐饮',1,'2018-08-08 17:58:54','2018-08-20 19:07:49','1062',0), + (2,'娱乐',1,'2018-08-10 22:13:38','2018-08-23 15:57:54','1062',0), + (3,'服饰',1,'2018-08-10 22:14:14','2018-08-23 15:57:56','1062',0), + (4,'亲子',1,'2018-08-10 22:15:00','2018-08-23 15:57:57','1062',0), + (5,'超市',1,'2018-08-10 22:15:17','2018-08-23 15:57:58','1062',0), + (6,'其他',1,'2028-08-10 22:15:17','2023-03-17 22:14:21','1062',1), + (7,'美妆',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1062',0), + (8,'珠宝',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1062',0), + (9,'服务',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1062',0), + (10,'家居',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1062',0), + (11,'数码家电',1,'2019-08-01 16:42:40','2019-08-01 16:42:40','1062',0); + +INSERT INTO `wx_business_63` (`id`, `title`, `type`, `create_date`, `update_date`, `final_tenant_id`, `is_system`) +VALUES + (1,'餐饮',1,'2018-08-08 17:58:54','2018-08-20 19:07:49','1063',0), + (2,'娱乐',1,'2018-08-10 22:13:38','2018-08-23 15:57:54','1063',0), + (3,'服饰',1,'2018-08-10 22:14:14','2018-08-23 15:57:56','1063',0), + (4,'亲子',1,'2018-08-10 22:15:00','2018-08-23 15:57:57','1063',0), + (5,'超市',1,'2018-08-10 22:15:17','2018-08-23 15:57:58','1063',0), + (6,'其他',1,'2028-08-10 22:15:17','2023-03-17 22:14:21','1063',1), + (7,'美妆',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1063',0), + (8,'珠宝',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1063',0), + (9,'服务',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1063',0), + (10,'家居',1,'2018-08-10 22:15:17','2019-04-09 19:32:30','1063',0), + (11,'数码家电',1,'2019-08-01 16:42:40','2019-08-01 16:42:40','1063',0); + + +drop table wx_business; + +#初始化数据加入id=constatn.default_business的记录 +#由集团版拆分到单广场,需要把wx_business拆分 + diff --git a/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java b/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java index add3e55d6..36b3b4a6e 100644 --- a/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java +++ b/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java @@ -351,6 +351,13 @@ public class BaseMyBatisConfiguration { wxCouponBatchItemSharding.setRule(EnumShardingRule.HASH.getCode()); shardingList.add(wxCouponBatchItemSharding); + ShardingSphere wxBusinessSharding = new ShardingSphere(); + wxBusinessSharding.setColumn("final_tenant_id"); + wxBusinessSharding.setTableName("wx_business"); + wxBusinessSharding.setCount(100); + wxBusinessSharding.setRule(EnumShardingRule.HASH.getCode()); + shardingList.add(wxBusinessSharding); + //初始化 shardingSpherePlugin.setShardingSpheres(shardingList); Properties properties = new Properties(); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java index 778cac0f7..b828c6dbb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java @@ -25,6 +25,9 @@ public class WxBusiness extends TenantEntityWithoutFinalTenantId { private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; + @io.swagger.annotations.ApiModelProperty(value="是否内置EnumYesOrNo",name="isSystem") + private Integer isSystem; + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="查询-开始时间",name="startdate") diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java index 9405187d3..8c8619dd9 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java @@ -10,7 +10,7 @@ public interface WxBusinessMapper extends CommonMapper { List findList(WxBusiness wxBusiness); - List findListAll(); + List findListAll(@Param("finalTenantId") String finalTenantId); List findListForMerchant(@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId); List findListForCoupon(@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId, @Param("platCode") Integer platCode); @@ -18,4 +18,8 @@ public interface WxBusinessMapper extends CommonMapper { List> businessDataList(WxBusiness wxBusiness); List> devoteList(WxBusiness wxBusiness); + + WxBusiness selectById(@Param("finalTenantId") String finalTenantId, @Param("id") Integer id); + + List selectByIds(@Param("finalTenantId") String finalTenantId, @Param("ids") List ids); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java b/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java index 837b2d76c..5240cd1d4 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java @@ -22,7 +22,7 @@ public interface WxBusinessService { */ PageInfo listAsPage(WxBusiness record, Integer pageIndex, Integer pageSize); - Map findAllMap(); + Map findAllMap(TenantEntity tenantEntity); /** * 根据实体查询列表 @@ -45,9 +45,9 @@ public interface WxBusinessService { * @param id * @return */ - WxBusiness getById(Integer id); + WxBusiness getById(Integer id,String finalTenantId); - List getByIds(Collection ids); + List getByIds(Collection ids,String finalTenantId); List> businessDataList(TenantEntity tenantEntity,WxBusiness wxBusiness,Long userid); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java index 98c2c4f3a..c584293d6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -53,7 +53,7 @@ public class WxBusinessServiceImpl implements WxBusinessService { @Override public List findListAll(TenantEntity tenantEntity, Integer filter,Integer paltCode) { if (filter == null){ - return wxBusinessMapper.findListAll(); + return wxBusinessMapper.findListAll(tenantEntity.getFinalTenantId()); }else if (filter.equals(EnumBusinessFilter.FILTER_BY_COUPON.getCode())) { if (paltCode == null) paltCode = EnumAppPlat.WX.getCode(); @@ -61,19 +61,19 @@ public class WxBusinessServiceImpl implements WxBusinessService { }else if (filter.equals(EnumBusinessFilter.FILTER_BY_MERCHANT.getCode())) { return wxBusinessMapper.findListForMerchant(tenantEntity.getTenantId(), tenantEntity.getParentTenantId()); }else { - return wxBusinessMapper.findListAll(); + return wxBusinessMapper.findListAll(tenantEntity.getFinalTenantId()); } } @Override - public WxBusiness getById(Integer id) { - return wxBusinessMapper.selectById(id); + public WxBusiness getById(Integer id,String finalTenantId) { + return wxBusinessMapper.selectById(finalTenantId,id); } @Override - public List getByIds(Collection ids) { - return wxBusinessMapper.selectBatchIds(ids); + public List getByIds(Collection ids,String finalTenantId) { + return wxBusinessMapper.selectByIds(finalTenantId,(List) ids); } @@ -81,6 +81,7 @@ public class WxBusinessServiceImpl implements WxBusinessService { public List> businessDataList(TenantEntity tenantEntity,WxBusiness wxBusiness, Long userid) { //1 得到天数+1 int day = DateUtils.daysBetween(wxBusiness.getStartdate(), wxBusiness.getEnddate()) + 1; + wxBusiness.setFinalTenantId(tenantEntity.getFinalTenantId()); List> resultList = wxBusinessMapper.businessDataList(wxBusiness); resultList.stream().forEach(e -> { BigDecimal businessSumMoney = new BigDecimal(0); @@ -208,8 +209,8 @@ public class WxBusinessServiceImpl implements WxBusinessService { } @Override - public Map findAllMap() { - List list = wxBusinessMapper.findListAll(); + public Map findAllMap(TenantEntity tenantEntity) { + List list = wxBusinessMapper.findListAll(tenantEntity.getFinalTenantId()); Map map = new HashMap(); if (null != list) { for (int i = 0 ; i < list.size() ; i++) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 6d585b8c2..cf93bee9a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -761,7 +761,9 @@ public class WxChartServiceImpl implements WxChartDataService { private ResultData getBusiness(TenantEntity tenantEntity,Map paramsMap){ Map resultMap = new LinkedMap(); Map bussnessNameMap = new HashMap(); - List businessList = wxBusinessService.findList(new WxBusiness()); + WxBusiness bq = new WxBusiness(); + bq.setFinalTenantId(tenantEntity.getFinalTenantId()); + List businessList = wxBusinessService.findList(bq); for (WxBusiness b:businessList) { resultMap.put(b.getTitle(),0l); bussnessNameMap.put(b.getId(), b.getTitle()); 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 f41f4dbd7..011e6260c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -215,7 +215,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { if (null == merchantList || merchantList.size() <= 0 ) { return null; } - List bussinessList = wxBusinessMapper.findListAll(); + List bussinessList = wxBusinessMapper.findListAll(tenantEntity.getFinalTenantId()); Map bussinessMap = new HashMap(); if (null != bussinessList) { for (int i = 0 ; i < bussinessList.size() ; i ++) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index 001881d2e..8ad3bd5dd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -111,8 +111,8 @@ public class WxShopServiceImpl implements WxShopService { return wxMallBuildingService.getBuildingMap(tenantEntity); } - private Map getBussinessMap() { - return wxBusinessService.findAllMap(); + private Map getBussinessMap(TenantEntity tenantEntity) { + return wxBusinessService.findAllMap(tenantEntity); } private Map getBrandMap(TenantEntity tenantEntity) { @@ -279,7 +279,7 @@ public class WxShopServiceImpl implements WxShopService { Map floorMap = this.getFloorMap(record); Map buildingMap = this.getBuildingMap(record); Map brandMap = this.getBrandMap(record); - Map businessMap = this.getBussinessMap(); + Map businessMap = this.getBussinessMap(record); Map shopMerchantIdMap = new HashMap(); Map merchantMap = new HashMap(); @@ -606,7 +606,7 @@ public class WxShopServiceImpl implements WxShopService { } Map buildMap = this.getBuildingMap(tenantEntity); Map floorMap = this.getFloorMap(tenantEntity); - Map businessMap = this.getBussinessMap(); + Map businessMap = this.getBussinessMap(tenantEntity); Long build = (Long)shop.get("buildingId"); if (null != build) { shop.put("building", buildMap.get(build)); @@ -635,7 +635,7 @@ public class WxShopServiceImpl implements WxShopService { Map shop = shops.get(0); Map buildMap = this.getBuildingMap(tenantInfo); Map floorMap = this.getFloorMap(tenantInfo); - Map businessMap = this.getBussinessMap(); + Map businessMap = this.getBussinessMap(tenantInfo); Long build = (Long)shop.get("buildingId"); if (null != build) { shop.put("building", buildMap.get(build)); diff --git a/mallinkService/src/main/java/com/iformall/service/invest/InvestBizService.java b/mallinkService/src/main/java/com/iformall/service/invest/InvestBizService.java index 59318a05e..aeb9ffee8 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/InvestBizService.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/InvestBizService.java @@ -21,7 +21,7 @@ public interface InvestBizService { void exportCustomerTemplate(HttpServletResponse response); - void importCustomer(MultipartFile mFile); + void importCustomer(TenantEntity tenantEntity,MultipartFile mFile); Map queryCustomerImportCount() ; @@ -57,9 +57,9 @@ public interface InvestBizService { InvestRemindVo findRemindById(Long id) ; - Collection findOperateById(InvestOperateRecordQuery params) ; + Collection findOperateById(TenantEntity tenantEntity,InvestOperateRecordQuery params) ; - InvestPageResult findOperateListById(InvestOperateRecordQuery params) ; + InvestPageResult findOperateListById(TenantEntity tenantEntity,InvestOperateRecordQuery params) ; InvestFollowRecordVo findFollowRecordById(Long id) ; diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java index 4d87f6b62..ba7cae3ed 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java @@ -199,8 +199,11 @@ public class InvestBaseServiceImpl, T> extends ServiceIm InvestHelper.isTrue(Objects.nonNull(customerEntity), ErrorCode.INVEST_CUSTOMER_NOT_FOUND, id); } - void checkBusiness(WxBusinessService businessService, Integer businessId) { - WxBusiness business = businessService.getById(businessId); + void checkBusiness(TenantEntity tenantEntity,WxBusinessService businessService, Integer businessId) { + if (null == tenantEntity.getFinalTenantId()) { + InvestHelper.notNull(tenantEntity, ErrorCode.BUSINESS_NOT_FOUND); + } + WxBusiness business = businessService.getById(businessId,tenantEntity.getFinalTenantId()); InvestHelper.notNull(business, ErrorCode.BUSINESS_NOT_FOUND); } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java index ed3d3e574..b76176ffa 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java @@ -167,7 +167,7 @@ public class InvestBizServiceImpl implements InvestBizService { } @Override - public void importCustomer(MultipartFile mFile) { + public void importCustomer(TenantEntity tenantEntity,MultipartFile mFile) { if (mFile.isEmpty()) { throw new MallinkException(Result.ERROR, "上传文件不能为空"); } @@ -231,7 +231,7 @@ public class InvestBizServiceImpl implements InvestBizService { } } - doImport(lFile, importKey); + doImport(tenantEntity,lFile, importKey); } @Override @@ -268,7 +268,7 @@ public class InvestBizServiceImpl implements InvestBizService { return entries; } - private void doImport(File file, String importKey) { + private void doImport(TenantEntity tenantEntity,File file, String importKey) { ImportParams params = new ImportParams(); // 需要验证 params.setImportFields(new String[]{"品牌*", "品牌负责人*", "负责人电话*", "经营业态*", "意向铺位*", "意向租凭面积", "预计开业时间"}); @@ -325,7 +325,7 @@ public class InvestBizServiceImpl implements InvestBizService { Map brandMap = getBrandMap(); //业态信息 - Map businesseMap = getBusinessMap(); + Map businesseMap = getBusinessMap(tenantEntity); //商铺信息 WxShop shopQuery = new WxShop(); @@ -396,7 +396,9 @@ public class InvestBizServiceImpl implements InvestBizService { } } - private Map getBusinessMap() { + private Map getBusinessMap(TenantEntity tenantEntity) { + WxBusiness bq = new WxBusiness(); + bq.setFinalTenantId(tenantEntity.getFinalTenantId()); List businesses = businessService.listAsPage(null, 1, Integer.MAX_VALUE).getList(); return getMap(businesses, WxBusiness::getTitle); } @@ -952,13 +954,13 @@ public class InvestBizServiceImpl implements InvestBizService { } @Override - public Collection findOperateById(InvestOperateRecordQuery params) { + public Collection findOperateById(TenantEntity tenantEntity,InvestOperateRecordQuery params) { params.setPageSize(Integer.MAX_VALUE); - return findOperateListById(params).getRecords(); + return findOperateListById(tenantEntity,params).getRecords(); } @Override - public InvestPageResult findOperateListById(InvestOperateRecordQuery params) { + public InvestPageResult findOperateListById(TenantEntity tenantEntity,InvestOperateRecordQuery params) { InvestHelper.notNull(params, params.getRecordType(), params.getTid()); InvestPageResult investPage = new InvestPageResult<>(); InvestPageResult entityPageList = operateRecordService.selectPageByTid(params); @@ -974,7 +976,9 @@ public class InvestBizServiceImpl implements InvestBizService { Map brandMap = getMap(brands, WxBrand::getId); //业态信息 - List businesses = businessService.listAsPage(null, 1, Integer.MAX_VALUE).getList(); + WxBusiness bq = new WxBusiness(); + bq.setFinalTenantId(tenantEntity.getFinalTenantId()); + List businesses = businessService.listAsPage(bq, 1, Integer.MAX_VALUE).getList(); Map businesseMap = getMap(businesses, WxBusiness::getId); //业态信息 @@ -1275,7 +1279,7 @@ public class InvestBizServiceImpl implements InvestBizService { //4、品牌 Map brandMap = getMap(brandService.getByIds(getIds(customers, InvestCustomerEntity::getBrandId)), WxBrand::getId); //5、用户 - Map bussinessMap = getMap(businessService.getByIds(getIds(customers, InvestCustomerEntity::getBusinessId)), WxBusiness::getId); + Map bussinessMap = getMap(businessService.getByIds(getIds(customers, InvestCustomerEntity::getBusinessId),tenantEntity.getFinalTenantId()), WxBusiness::getId); List resultList = new ArrayList<>(); for (InvestCustomerEntity costomerItem : customers) { InvestDemandEntity demandItem = demindsMap.get(costomerItem.getId()); diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java index 9f3da6fe6..848c41613 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java @@ -3,6 +3,7 @@ package com.iformall.service.invest.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.iformall.common.ErrorCode; import com.iformall.common.TableLog; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.invest.InvestCustomerEntity; import com.iformall.domain.vo.invest.InvestCustomerVo; import com.iformall.enums.EnumCustomerType; @@ -44,13 +45,12 @@ public class InvestCustomerServiceImpl extends InvestBaseServiceImpl + - `id`,`title`,`type`,`create_date`,`update_date`,`final_tenant_id` + `id`,`title`,`type`,`create_date`,`update_date`,`final_tenant_id`,`is_system` @@ -40,6 +41,10 @@ and `final_tenant_id` = #{finalTenantId} + + + and `is_system` = #{isSystem} + and id in @@ -50,6 +55,22 @@ order by ${sortColumns} + + + + select - from wx_business + from wx_business where `final_tenant_id` = #{finalTenantId} order by create_date asc