经销商区域公司多选

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/CommerceInfoDto.java

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.yeejoin.amos.boot.module.hygf.api.entity.RegionalCompanies;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 经销商单位信息
@@ -45,4 +47,7 @@ public class CommerceInfoDto  extends BaseDto {
     @ApiModelProperty(value = "单位id")
     private Long unitSeq;
 
+
+
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/UnitInfoDto.java

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.module.hygf.api.entity.RegionalCompanies;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 经销商人员信息
@@ -97,14 +99,14 @@ public class UnitInfoDto  extends BaseDto {
 
     //所属区域公司id
 
-    private Long regionalCompaniesSeq;
+    private List<Long> regionalCompaniesSeq;
     //所属区域公司名称
     private String regionalCompaniesName;
     //所属区域公司code
     private String regionalCompaniesCode;
 
 
-
+    List<RegionalCompanies> regionalCompanies;
 
     /**
      *是否加入黑名单

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/UnitInfo.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.module.hygf.api.dto.CommonFile;
 import io.swagger.annotations.ApiModelProperty;
@@ -182,8 +183,8 @@ public class UnitInfo extends BaseEntity {
 
 
     //所属区域公司id
-    @TableField("regional_companies_seq")
-    private Long regionalCompaniesSeq;
+    @TableField(value = "regional_companies_seq",typeHandler = FastjsonTypeHandler.class)
+    private List<Long> regionalCompaniesSeq;
     //所属区域公司名称
     @TableField("regional_companies_name")
     private String regionalCompaniesName;

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PeasantHouseholdServiceImpl.java

@@ -505,10 +505,10 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         if (!CollectionUtils.isEmpty(unitInfos)) {
             log.warn("userId:{} 查询不到经销商信息", userInfo.getUserId());
             unitInfo = unitInfos.get(0);
-            Long regionalCompaniesSeq = unitInfo.getRegionalCompaniesSeq();
+           // Long regionalCompaniesSeq = unitInfo.getRegionalCompaniesSeq();
             String regionalCompaniesCode = unitInfo.getRegionalCompaniesCode();
             String regionalCompaniesName = unitInfo.getRegionalCompaniesName();
-            dto.setRegionalCompaniesSeq(regionalCompaniesSeq);//所属区域公司id
+            dto.setRegionalCompaniesSeq(null);//所属区域公司id
             dto.setRegionalCompaniesCode(regionalCompaniesCode);//所属区域公司code
             dto.setRegionalCompaniesName(regionalCompaniesName);//所属区域公司名称
         }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/UnitInfoServiceImpl.java

@@ -19,8 +19,10 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.fegin.IdxFeginService;
 import com.yeejoin.amos.boot.module.hygf.api.fegin.PrivilegeFeginService;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.DealerReviewMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.RegionalCompaniesMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.UnitInfoMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IDealerReviewService;
+import com.yeejoin.amos.boot.module.hygf.api.service.IRegionalCompaniesService;
 import com.yeejoin.amos.boot.module.hygf.api.service.IUnitInfoService;
 import com.yeejoin.amos.boot.module.hygf.api.dto.UnitInfoDto;
 import com.yeejoin.amos.component.feign.config.TokenOperation;
@@ -79,6 +81,10 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
     @Autowired
     CommerceInfoServiceImpl commerceInfoService;
     @Autowired
+    RegionalCompaniesServiceImpl regionalCompaniesService;
+
+
+    @Autowired
     IDealerReviewService dealerReviewService;
     @Value("${hygf.user.group.id}")
     private long userGroupId;
@@ -108,6 +114,14 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
 
     @Value("${hygf.sms.tempCodeJXS}")
     private String smsTempCode;
+
+
+    @Value("${dealer.managementUnitId}")
+    private String managementUnitId;
+
+    @Value("${dealer.roleId}")
+    private String roleId;
+
     /**
      * 分页查询
      */
@@ -138,7 +152,11 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
     @Override
     @Transactional
     public UnitRegisterDto registerUnit(UnitRegisterDto model) {
+
         UnitInfoDto regUnitInfo = model.getUnitInfoDto();
+        regUnitInfo.setRoleId(roleId);
+        regUnitInfo.setManagementUnitId(managementUnitId);
+        regUnitInfo.setManagementUnit("经销商");
         try {
             // 1. 调用平台进行创建单位、用户信息
             this.createCompanyAndUser(regUnitInfo);
@@ -148,6 +166,12 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
             CommerceInfoDto commerceInfo = model.getCommerceInfoDto();
             commerceInfo.setUnitSeq(regUnitInfo.getSequenceNbr());
             commerceInfo = commerceInfoService.createWithModel(commerceInfo);
+
+            List<RegionalCompanies> regionalCompanies= regUnitInfo.getRegionalCompanies();
+            for (RegionalCompanies regionalCompany : regionalCompanies) {
+                regionalCompany.setUnitId(commerceInfo.getSequenceNbr());
+            }
+            regionalCompaniesService.saveBatch(regionalCompanies);
             model.setCommerceInfoDto(commerceInfo);
             model.setUnitInfoDto(regUnitInfo);
         } catch (Exception e) {
@@ -245,8 +269,8 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
         CompanyModel companyInfo = new CompanyModel();
         FeignClientResult<AgencyUserModel> userResult = null;
         try {
-            FeignClientResult<List<RoleModel>> roleListResult = Privilege.roleClient.queryRoleList(null, null);
-            List<RoleModel> allRoleList = roleListResult.getResult();
+           // FeignClientResult<List<RoleModel>> roleListResult = Privilege.roleClient.queryRoleList(null, null);
+           // List<RoleModel> allRoleList = roleListResult.getResult();
             List<RoleModel> userRoleList = new ArrayList<>();
             List<Long> roleIds = new ArrayList<>();
             // 1创建公司
@@ -280,13 +304,14 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
             List<String> split = Arrays.asList(StringUtils.split(appCodes, ','));
             Map<Long, List<Long>> roleSeqMap = new HashMap<>();
             Map<Long, List<RoleModel>> orgRoles = new HashMap<>();
-            userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(regUnitInfo.getUnitTypeCode()))
-                    .collect(Collectors.toList());
-            userRoleList.forEach(r -> {
-                if (!roleIds.contains(r.getSequenceNbr())) {
-                    roleIds.add(r.getSequenceNbr());
-                }
-            });
+//            userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(regUnitInfo.getUnitTypeCode()))
+//                    .collect(Collectors.toList());
+//            userRoleList.forEach(r -> {
+//                if (!roleIds.contains(r.getSequenceNbr())) {
+//                    roleIds.add(r.getSequenceNbr());
+//                }
+//            });
+            roleIds.add(Long.valueOf(regUnitInfo.getRoleId()));
             roleSeqMap.put(companyInfo.getSequenceNbr(), roleIds);
             orgRoles.put(companyInfo.getSequenceNbr(), userRoleList);
             agencyUserModel.setAppCodes(split);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev.properties

@@ -120,7 +120,7 @@ regionalCompanies.company.seq=1693499571071619074
 qiyuesuo.serverUrl = https://openapi.qiyuesuo.cn
 qiyuesuo.accessKey = TdBmNkjAYd
 qiyuesuo.accessSecret = y8KiDFKKDdC9Ld9Cm5zuy2rpXjxP5Z
-
+qiyuesuo.secretKey=
 # ============================================= v20230821 add properties =============================================
 security.productWeb=AMOS_STUDIO_WEB
 security.appKey=AMOS_STUDIO
@@ -140,4 +140,9 @@ platform.access.password=AC286A35E74D2DD281EB979789DECF3A
 # 测试用的经销商userid
 dealer.userId=
 # 测试的时候默认密码
-farmer.registerPassword=a123456
+farmer.registerPassword=a123456
\ No newline at end of file
+
+#经销商单位父节点id
+dealer.managementUnitId=1678209772383399937
+#经销商管理员角色名称
+dealer.roleId=1678211468450885633
\ No newline at end of file