修改经销商注册

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -33,20 +34,25 @@ public class PersonnelBusinessDto  extends BaseDto {
     @ApiModelProperty(value = "证书")
     private String certificate;
 
-    @ApiModelProperty(value = "业务单位名称")
-    private String businessUnitName;
-
-    @ApiModelProperty(value = "业务单位id")
-    private Long businessUnitId;
-
+    /**
+     * 所属单位名称
+     */
+    private String amosUnitName;
+    /**
+     * 所属单位id
+     */
+    private Long amosUnitId;
+    /**
+     * 所属单位orgcode
+     */
+    private String amosUnitOrgCode;
     @ApiModelProperty(value = "业务经销商id")
     private Long dealerId;
 
     @ApiModelProperty(value = "平台经销商单位id")
     private Long amosDealerId;
 
-    @ApiModelProperty(value = "平台经销商code")
-    private String amosDealerCode;
+
 
     @ApiModelProperty(value = "用户基础表id")
     private Long foundationId;

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

@@ -97,6 +97,9 @@ public class UnitInfoDto  extends BaseDto {
     private String managementUnitId;
 
 
+    @ApiModelProperty(value = "单位code")
+    private String amosCompanyCode;
+
     //所属区域公司id
 
     private List<Long> regionalCompaniesSeq;

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

@@ -47,16 +47,21 @@ public class PersonnelBusiness extends BaseEntity {
     private String certificate;
 
     /**
-     * 业务单位名称
+     * 所属单位名称
      */
-	@TableField("business_unit_name")
-    private String businessUnitName;
+	@TableField("amos_unit_name")
+    private String amosUnitName;
 
     /**
-     * 业务单位id
+     * 所属单位id
      */
-	@TableField("business_unit_id")
-    private Long businessUnitId;
+	@TableField("amos_unit_id")
+    private Long amosUnitId;
+    /**
+     * 所属单位orgcode
+     */
+    @TableField("amos_unit_org_code")
+    private String amosUnitOrgCode;
 
     /**
      * 业务经销商id
@@ -70,11 +75,6 @@ public class PersonnelBusiness extends BaseEntity {
 	@TableField("amos_dealer_id")
     private Long amosDealerId;
 
-    /**
-     * 平台经销商code
-     */
-	@TableField("amos_dealer_code")
-    private String amosDealerCode;
 
     /**
      * 用户基础表id

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

@@ -46,4 +46,14 @@ public class RegionalCompanies extends BaseEntity {
 	@TableField("unit_id")
     private Long unitId;
 
+
+    public RegionalCompanies(Long regionalCompaniesSeq, String regionalCompaniesName, String regionalCompaniesCode, Long unitId) {
+        this.regionalCompaniesSeq = regionalCompaniesSeq;
+        this.regionalCompaniesName = regionalCompaniesName;
+        this.regionalCompaniesCode = regionalCompaniesCode;
+        this.unitId = unitId;
+    }
+
+    public RegionalCompanies() {
+    }
 }

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

@@ -169,6 +169,10 @@ public class UnitInfo extends BaseEntity {
      */
     @TableField("management_unit_id")
     private String managementUnitId;
+
+
+    @TableField("amos_company_code")
+    private String amosCompanyCode;
     /**
      *是否加入黑名单
      * */

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/UnitInfoController.java

@@ -7,12 +7,10 @@ import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
-import com.yeejoin.amos.boot.module.hygf.api.entity.CommerceInfo;
-import com.yeejoin.amos.boot.module.hygf.api.entity.DealerReview;
-import com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract;
-import com.yeejoin.amos.boot.module.hygf.api.entity.UnitInfo;
+import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.hwsms.SendSmsCode;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.CommerceInfoMapper;
+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.biz.service.impl.DealerReviewServiceImpl;
 import com.yeejoin.amos.boot.module.standard.api.entity.PublicAgencyUser;
@@ -79,7 +77,8 @@ public class UnitInfoController extends BaseController {
 
     @Value("${regionalCompanies.company.seq}")
     private Long regionalCompanies;
-
+    @Autowired
+    RegionalCompaniesMapper regionalCompaniesMapper;
 
 	@Autowired
 	SendSmsCode sendSmsCode;
@@ -479,4 +478,40 @@ public class UnitInfoController extends BaseController {
 
         return ResponseHelper.buildResponse(unitInfoServiceImpl.getCompanyDto(dto));
     }
+
+
+    //获取经销商组织机构
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getUnitTree")
+    @ApiOperation(httpMethod = "GET", value = "管辖机构树", notes = "管辖机构树")
+    public ResponseModel<Collection<CompanyModel>> getUnitTree() {
+        CompanyModel companyM = getUserInfo().getCompanys().get(0);
+
+        FeignClientResult<Collection<CompanyModel>> feignClientResult;
+        Collection<CompanyModel>  children=null;
+        try {
+            feignClientResult = Privilege.companyClient.querySubAgencyTree(companyM.getSequenceNbr());
+            children =  feignClientResult.getResult();
+
+        } catch (InnerInvokException e) {
+            e.printStackTrace();
+        }
+
+
+        return ResponseHelper.buildResponse(children);
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getRegionalCompaniesTree")
+    @ApiOperation(httpMethod = "GET", value = "区域公司", notes = "区域公司")
+    public ResponseModel<List<RegionalCompanies>> getRegionalCompaniesTree() {
+        Long id=null;
+
+        LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper<>();
+        qu.eq(RegionalCompanies::getUnitId,id);
+        List<RegionalCompanies> data= regionalCompaniesMapper.selectList(qu);
+        return ResponseHelper.buildResponse(data);
+    }
+
+
 }

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

@@ -20,13 +20,12 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 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.CommerceInfoMapper;
-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.mapper.*;
 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.standard.api.entity.PublicAgencyUser;
+import com.yeejoin.amos.boot.module.standard.api.mapper.PublicAgencyUserMapper;
 import com.yeejoin.amos.component.feign.config.TokenOperation;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
@@ -92,12 +91,14 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
     CommerceInfoMapper commerceInfoMapper;
     @Autowired
     RegionalCompaniesMapper regionalCompaniesMapper;
-
+    @Autowired
+    PublicAgencyUserMapper publicAgencyUserMapper;
     @Autowired
     IDealerReviewService dealerReviewService;
     @Value("${hygf.user.group.id}")
     private long userGroupId;
-
+    @Value("${regionalCompanies.company.seq}")
+    private Long regionalCompanies;
     @Autowired
     IdxFeginService idxFeginService;
     private static final String regionRedis="app_region_redis";
@@ -131,6 +132,8 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
     @Value("${dealer.roleId}")
     private String roleId;
 
+    @Autowired
+    PersonnelBusinessMapper personnelBusinessMapper;
     /**
      * 分页查询
      */
@@ -181,6 +184,25 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
                 regionalCompany.setUnitId(commerceInfo.getSequenceNbr());
             }
             regionalCompaniesService.saveBatch(regionalCompanies);
+
+            //新增人员基础信息表
+
+            PersonnelBusiness re=new PersonnelBusiness();
+            PublicAgencyUser publicAgencyUser=new PublicAgencyUser();
+            publicAgencyUser.setAmosUserId(regUnitInfo.getAdminUserId());
+            publicAgencyUser.setAmosUserName(regUnitInfo.getAdminUserName());
+            publicAgencyUser.setRealName(regUnitInfo.getAdminLoginName());
+            publicAgencyUser.setRole("["+regUnitInfo.getRoleId()+"]");
+            publicAgencyUser.setEmergencyTelephone(regUnitInfo.getAdminPhone());
+            publicAgencyUserMapper.insert(publicAgencyUser);
+
+
+            re.setAmosDealerId(regUnitInfo.getAmosCompanySeq());
+            re.setAmosUnitId(regUnitInfo.getAmosCompanySeq());
+            re.setAmosUnitName(regUnitInfo.getName());
+            re.setAmosUnitOrgCode(regUnitInfo.getAmosCompanyCode());
+            re.setFoundationId(publicAgencyUser.getSequenceNbr());
+            personnelBusinessMapper.insert(re);
             model.setCommerceInfoDto(commerceInfo);
             model.setUnitInfoDto(regUnitInfo);
         } catch (Exception e) {
@@ -333,6 +355,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
 //            String[] userIds = { userResult.getResult().getUserId() };
             regUnitInfo.setAdminUserId(userResult.getResult().getUserId());
             regUnitInfo.setAmosCompanySeq(companyInfo.getSequenceNbr());
+            regUnitInfo.setAmosCompanyCode(companyInfo.getOrgCode());
             List<String> userId = new ArrayList<>();
             userId.add(userResult.getResult().getUserId());
             // 将创建用户加入用户组
@@ -517,7 +540,6 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
                            if (i != len - 1) {
                                codenameRegi.append("-");
                            }
-//                           continue;
                        }
                    }
                }
@@ -529,22 +551,16 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
                StringBuilder codenamework= new StringBuilder();;
                    for (int i = 0, len = workP.size(); i < len; i++) {
                        for (RegionModel regionModel : list) {
-
                        if (regionModel.getRegionCode().intValue() == workP.get(i).intValue()) {
-
                            codenamework.append(regionModel.getRegionName());
                            if (i != len - 1) {
                                codenamework.append("-");
                            }
-//                           continue;
                        }
-
                    }
                }
                unitInformation.setWorkPcd(codenamework!=null?codenamework.toString():null);
            }
-
-
        unitInformation.setHeadCardPhotoBackUrl(unitInformation.getHeadCardPhotoBackUrl());
        unitInformation.setHeadCardPhotoFrontUrl(unitInformation.getHeadCardPhotoFrontUrl());
        unitInformation.setRegisterPcdCodeList(unitInformation.getRegisterPcdCodeList());
@@ -557,11 +573,30 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
        commerceDto.setLegalPersonCardPhotoBackUrl(commerceDto.getLegalPersonCardPhotoBackUrl());
        commerceDto.setLegalPersonCardPhotoFrontUrl(commerceDto.getLegalPersonCardPhotoFrontUrl());
         BeanUtils.copyProperties(commerceDto,commerceInfo);
-
         unitInfoMapper.updateById(unitInfo);
-
         commerceInfoMapper.updateById(commerceInfo);
 
+       //区域公司
+       LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper<>();
+       qu.eq(RegionalCompanies::getUnitId,unitInfo.getSequenceNbr());
+       regionalCompaniesMapper.delete(qu);
+       List<RegionalCompanies> regionalComp= new ArrayList<>();
+       FeignClientResult<Collection<CompanyModel>> feignClientResult=  Privilege.companyClient.querySubAgencyTree(regionalCompanies);
+       List<CompanyModel>  companyModel = (List<CompanyModel>)feignClientResult.getResult();
+       List<Long>  lisd=unitInfo.getRegionalCompaniesSeq();
+       if(companyModel!=null&&!companyModel.isEmpty()&&lisd!=null&&!lisd.isEmpty()){
+           for (Long aLong : lisd) {
+               for (CompanyModel compan : companyModel) {
+                   if(compan.getSequenceNbr().longValue()==aLong.longValue()){
+                       RegionalCompanies re=  new RegionalCompanies(aLong, compan.getCompanyName(), compan.getOrgCode(), unitInfo.getSequenceNbr());
+                       regionalComp.add(re);
+                       continue;
+                   }
+               }
+           }
+
+       }
+       regionalCompaniesService.saveBatch(regionalComp);
         return true;
     }