Browse Source

fix 自定义业态

release_toaliyun_real
lin 3 years ago
parent
commit
e6b3b73b64
16 changed files with 547 additions and 41 deletions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java
  2. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java
  3. +461
    -0
      mallinkAdmin/src/main/resources/db/migration/V20230323000001_business.sql
  4. +7
    -0
      mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java
  5. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java
  6. +5
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java
  7. +3
    -3
      mallinkService/src/main/java/com/iformall/service/WxBusinessService.java
  8. +9
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java
  9. +3
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java
  10. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  11. +5
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java
  12. +3
    -3
      mallinkService/src/main/java/com/iformall/service/invest/InvestBizService.java
  13. +5
    -2
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java
  14. +14
    -10
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java
  15. +2
    -2
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java
  16. +23
    -2
      mallinkService/src/main/resources/mapper/WxBusinessMapper.xml

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java View File

@@ -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")


+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java View File

@@ -52,7 +52,7 @@ public class InvestOperateRecordController extends InvestBaseController {
*/
@GetMapping("/listById")
public InvestResultData<InvestPageResult<InvestOperateRecordVo>> 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<Collection<InvestOperateRecordVo>> info(InvestOperateRecordQuery params) {
return execute(params, p -> bizService.findOperateById(p));
return execute(params, p -> bizService.findOperateById(this.getTenantInfo(),p));
}

/**


+ 461
- 0
mallinkAdmin/src/main/resources/db/migration/V20230323000001_business.sql View File

@@ -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拆分



+ 7
- 0
mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java View File

@@ -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();


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java View File

@@ -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")


+ 5
- 1
mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java View File

@@ -10,7 +10,7 @@ public interface WxBusinessMapper extends CommonMapper<WxBusiness, String> {

List<WxBusiness> findList(WxBusiness wxBusiness);

List<WxBusiness> findListAll();
List<WxBusiness> findListAll(@Param("finalTenantId") String finalTenantId);
List<WxBusiness> findListForMerchant(@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId);
List<WxBusiness> findListForCoupon(@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId, @Param("platCode") Integer platCode);

@@ -18,4 +18,8 @@ public interface WxBusinessMapper extends CommonMapper<WxBusiness, String> {
List<Map<String,Object>> businessDataList(WxBusiness wxBusiness);

List<Map<String,Object>> devoteList(WxBusiness wxBusiness);
WxBusiness selectById(@Param("finalTenantId") String finalTenantId, @Param("id") Integer id);
List<WxBusiness> selectByIds(@Param("finalTenantId") String finalTenantId, @Param("ids") List<Integer> ids);
}

+ 3
- 3
mallinkService/src/main/java/com/iformall/service/WxBusinessService.java View File

@@ -22,7 +22,7 @@ public interface WxBusinessService {
*/
PageInfo<WxBusiness> listAsPage(WxBusiness record, Integer pageIndex, Integer pageSize);
Map<Integer,WxBusiness> findAllMap();
Map<Integer,WxBusiness> findAllMap(TenantEntity tenantEntity);

/**
* 根据实体查询列表
@@ -45,9 +45,9 @@ public interface WxBusinessService {
* @param id
* @return
*/
WxBusiness getById(Integer id);
WxBusiness getById(Integer id,String finalTenantId);

List<WxBusiness> getByIds(Collection<? extends Serializable> ids);
List<WxBusiness> getByIds(Collection<? extends Serializable> ids,String finalTenantId);


List<Map<String,Object>> businessDataList(TenantEntity tenantEntity,WxBusiness wxBusiness,Long userid);


+ 9
- 8
mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java View File

@@ -53,7 +53,7 @@ public class WxBusinessServiceImpl implements WxBusinessService {
@Override
public List<WxBusiness> 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<WxBusiness> getByIds(Collection<? extends Serializable> ids) {
return wxBusinessMapper.selectBatchIds(ids);
public List<WxBusiness> getByIds(Collection<? extends Serializable> ids,String finalTenantId) {
return wxBusinessMapper.selectByIds(finalTenantId,(List<Integer>) ids);
}


@@ -81,6 +81,7 @@ public class WxBusinessServiceImpl implements WxBusinessService {
public List<Map<String, Object>> businessDataList(TenantEntity tenantEntity,WxBusiness wxBusiness, Long userid) {
//1 得到天数+1
int day = DateUtils.daysBetween(wxBusiness.getStartdate(), wxBusiness.getEnddate()) + 1;
wxBusiness.setFinalTenantId(tenantEntity.getFinalTenantId());
List<Map<String, Object>> 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<Integer, WxBusiness> findAllMap() {
List<WxBusiness> list = wxBusinessMapper.findListAll();
public Map<Integer, WxBusiness> findAllMap(TenantEntity tenantEntity) {
List<WxBusiness> list = wxBusinessMapper.findListAll(tenantEntity.getFinalTenantId());
Map<Integer,WxBusiness> map = new HashMap<Integer,WxBusiness>();
if (null != list) {
for (int i = 0 ; i < list.size() ; i++) {


+ 3
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java View File

@@ -761,7 +761,9 @@ public class WxChartServiceImpl implements WxChartDataService {
private ResultData getBusiness(TenantEntity tenantEntity,Map<String, String> paramsMap){
Map<String,Long> resultMap = new LinkedMap();
Map<Integer,String> bussnessNameMap = new HashMap<Integer,String>();
List<WxBusiness> businessList = wxBusinessService.findList(new WxBusiness());
WxBusiness bq = new WxBusiness();
bq.setFinalTenantId(tenantEntity.getFinalTenantId());
List<WxBusiness> businessList = wxBusinessService.findList(bq);
for (WxBusiness b:businessList) {
resultMap.put(b.getTitle(),0l);
bussnessNameMap.put(b.getId(), b.getTitle());


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java View File

@@ -215,7 +215,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
if (null == merchantList || merchantList.size() <= 0 ) {
return null;
}
List<WxBusiness> bussinessList = wxBusinessMapper.findListAll();
List<WxBusiness> bussinessList = wxBusinessMapper.findListAll(tenantEntity.getFinalTenantId());
Map<Integer,WxBusiness> bussinessMap = new HashMap<Integer,WxBusiness>();
if (null != bussinessList) {
for (int i = 0 ; i < bussinessList.size() ; i ++) {


+ 5
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java View File

@@ -111,8 +111,8 @@ public class WxShopServiceImpl implements WxShopService {
return wxMallBuildingService.getBuildingMap(tenantEntity);
}
private Map<Integer, WxBusiness> getBussinessMap() {
return wxBusinessService.findAllMap();
private Map<Integer, WxBusiness> getBussinessMap(TenantEntity tenantEntity) {
return wxBusinessService.findAllMap(tenantEntity);
}
private Map<Long, WxBrand> getBrandMap(TenantEntity tenantEntity) {
@@ -279,7 +279,7 @@ public class WxShopServiceImpl implements WxShopService {
Map<Long, String> floorMap = this.getFloorMap(record);
Map<Long, String> buildingMap = this.getBuildingMap(record);
Map<Long, WxBrand> brandMap = this.getBrandMap(record);
Map<Integer, WxBusiness> businessMap = this.getBussinessMap();
Map<Integer, WxBusiness> businessMap = this.getBussinessMap(record);
Map<Long,Long> shopMerchantIdMap = new HashMap<Long,Long>();
Map<Long,WxMerchant> merchantMap = new HashMap<Long,WxMerchant>();
@@ -606,7 +606,7 @@ public class WxShopServiceImpl implements WxShopService {
}
Map<Long, String> buildMap = this.getBuildingMap(tenantEntity);
Map<Long, String> floorMap = this.getFloorMap(tenantEntity);
Map<Integer, WxBusiness> businessMap = this.getBussinessMap();
Map<Integer, WxBusiness> 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<String, Object> shop = shops.get(0);
Map<Long, String> buildMap = this.getBuildingMap(tenantInfo);
Map<Long, String> floorMap = this.getFloorMap(tenantInfo);
Map<Integer, WxBusiness> businessMap = this.getBussinessMap();
Map<Integer, WxBusiness> businessMap = this.getBussinessMap(tenantInfo);
Long build = (Long)shop.get("buildingId");
if (null != build) {
shop.put("building", buildMap.get(build));


+ 3
- 3
mallinkService/src/main/java/com/iformall/service/invest/InvestBizService.java View File

@@ -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<InvestOperateRecordVo> findOperateById(InvestOperateRecordQuery params) ;
Collection<InvestOperateRecordVo> findOperateById(TenantEntity tenantEntity,InvestOperateRecordQuery params) ;

InvestPageResult<InvestOperateRecordVo> findOperateListById(InvestOperateRecordQuery params) ;
InvestPageResult<InvestOperateRecordVo> findOperateListById(TenantEntity tenantEntity,InvestOperateRecordQuery params) ;

InvestFollowRecordVo findFollowRecordById(Long id) ;



+ 5
- 2
mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java View File

@@ -199,8 +199,11 @@ public class InvestBaseServiceImpl<M extends BaseMapper<T>, 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);
}



+ 14
- 10
mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java View File

@@ -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<String, WxBrand> brandMap = getBrandMap();

//业态信息
Map<String, WxBusiness> businesseMap = getBusinessMap();
Map<String, WxBusiness> businesseMap = getBusinessMap(tenantEntity);

//商铺信息
WxShop shopQuery = new WxShop();
@@ -396,7 +396,9 @@ public class InvestBizServiceImpl implements InvestBizService {
}
}

private Map<String, WxBusiness> getBusinessMap() {
private Map<String, WxBusiness> getBusinessMap(TenantEntity tenantEntity) {
WxBusiness bq = new WxBusiness();
bq.setFinalTenantId(tenantEntity.getFinalTenantId());
List<WxBusiness> 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<InvestOperateRecordVo> findOperateById(InvestOperateRecordQuery params) {
public Collection<InvestOperateRecordVo> findOperateById(TenantEntity tenantEntity,InvestOperateRecordQuery params) {
params.setPageSize(Integer.MAX_VALUE);
return findOperateListById(params).getRecords();
return findOperateListById(tenantEntity,params).getRecords();
}

@Override
public InvestPageResult<InvestOperateRecordVo> findOperateListById(InvestOperateRecordQuery params) {
public InvestPageResult<InvestOperateRecordVo> findOperateListById(TenantEntity tenantEntity,InvestOperateRecordQuery params) {
InvestHelper.notNull(params, params.getRecordType(), params.getTid());
InvestPageResult<InvestOperateRecordVo> investPage = new InvestPageResult<>();
InvestPageResult<InvestOperateRecordEntity> entityPageList = operateRecordService.selectPageByTid(params);
@@ -974,7 +976,9 @@ public class InvestBizServiceImpl implements InvestBizService {
Map<Long, WxBrand> brandMap = getMap(brands, WxBrand::getId);

//业态信息
List<WxBusiness> businesses = businessService.listAsPage(null, 1, Integer.MAX_VALUE).getList();
WxBusiness bq = new WxBusiness();
bq.setFinalTenantId(tenantEntity.getFinalTenantId());
List<WxBusiness> businesses = businessService.listAsPage(bq, 1, Integer.MAX_VALUE).getList();
Map<Integer, WxBusiness> businesseMap = getMap(businesses, WxBusiness::getId);

//业态信息
@@ -1275,7 +1279,7 @@ public class InvestBizServiceImpl implements InvestBizService {
//4、品牌
Map<Long, WxBrand> brandMap = getMap(brandService.getByIds(getIds(customers, InvestCustomerEntity::getBrandId)), WxBrand::getId);
//5、用户
Map<Integer, WxBusiness> bussinessMap = getMap(businessService.getByIds(getIds(customers, InvestCustomerEntity::getBusinessId)), WxBusiness::getId);
Map<Integer, WxBusiness> bussinessMap = getMap(businessService.getByIds(getIds(customers, InvestCustomerEntity::getBusinessId),tenantEntity.getFinalTenantId()), WxBusiness::getId);
List<InvestCustomerVo> resultList = new ArrayList<>();
for (InvestCustomerEntity costomerItem : customers) {
InvestDemandEntity demandItem = demindsMap.get(costomerItem.getId());


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java View File

@@ -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<InvestCusto
@TableLog
@Override
public boolean updateById(InvestCustomerEntity entity) {

return super.updateByIdAction(entity, this::checkBeforeSaveOrUpdate);
}


private void checkBeforeSaveOrUpdate(InvestCustomerEntity entity) {
checkBusiness(businessService, entity.getBusinessId());
checkBusiness(entity,businessService, entity.getBusinessId());
checkBrand(brandService, entity.getBrandId());
//checkType(entity);
if (Objects.isNull(entity.getBrandId())) {


+ 23
- 2
mallinkService/src/main/resources/mapper/WxBusinessMapper.xml View File

@@ -8,10 +8,11 @@
<result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
<result column="final_tenant_id" jdbcType="VARCHAR" property="finalTenantId" />
<result column="is_system" jdbcType="INTEGER" property="isSystem" />
</resultMap>
<sql id="allColumns">
`id`,`title`,`type`,`create_date`,`update_date`,`final_tenant_id`
`id`,`title`,`type`,`create_date`,`update_date`,`final_tenant_id`,`is_system`
</sql>

<sql id="dynamicWhereConditions">
@@ -40,6 +41,10 @@
<if test=" null != finalTenantId ">
and `final_tenant_id` = #{finalTenantId}
</if>
<if test=" null != isSystem ">
and `is_system` = #{isSystem}
</if>
<if test=" null != ids ">
and id in
@@ -50,6 +55,22 @@
<if test=" null != sortColumns"> order by ${sortColumns} </if>
</sql>
<select id="selectById" parameterType="Map" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from wx_business where id = #{id} and `final_tenant_id` = #{finalTenantId}
</select>
<select id="selectByIds" parameterType="Map" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from wx_business where `final_tenant_id` = #{finalTenantId}
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</select>
<select id="findList" parameterType="com.iformall.domain.po.WxBusiness" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
@@ -60,7 +81,7 @@
<select id="findListAll" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from wx_business
from wx_business where `final_tenant_id` = #{finalTenantId}
order by create_date asc
</select>



Loading…
Cancel
Save