Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-manage/src/main/resources/mapper/KwmCooperateMapper.xml

@@ -48,7 +48,7 @@
                min(b.create_by) createBy,
                min(a.remark) remark,
                min(a.approval_remark) approvalRemark,
-               case when min(a.ent_id) = #{reqDto.currentEntId} then min(a.inviter_ent_id) else min(a.invitee_ent_id) end targetEntId,
+               case when min(a.ent_id) = #{reqDto.currentEntId} then min(a.invitee_ent_id) else min(a.inviter_ent_id) end targetEntId,
                case when min(a.ent_id) = #{reqDto.currentEntId} then 1 else 2 end applyTypeCode
           FROM kwm_cooperate a
           LEFT JOIN kwm_cooperate_type b ON a.id = b.cooperate_id
@@ -137,7 +137,7 @@
                 min(b.create_by) createBy,
                 min(a.remark) remark,
                 min(a.approval_remark) approvalRemark,
-                case when min(a.ent_id) = #{reqDto.currentEntId} then min(a.inviter_ent_id) else min(a.invitee_ent_id) end targetEntId,
+                case when min(a.ent_id) = #{reqDto.currentEntId} then min(a.invitee_ent_id) else min(a.inviter_ent_id) end targetEntId,
                 case when min(a.ent_id) = #{reqDto.currentEntId} then 1 else 2 end applyTypeCode
         FROM kwm_cooperate a
         LEFT JOIN kwm_cooperate_type b ON a.id = b.cooperate_id and b.status = 1 and b.del_flag = 0

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -508,7 +508,6 @@ public class KwsEnterpriseService {
     @Transactional(rollbackFor = {})
     public void addEntSettle(AddEntSettleReqVo reqVo) throws SystemException {
         checkAddEntSettleParam(reqVo);
-        Long entId = new IdWorker(1L).nextId();
         //运营端新增企业入驻，直接通过
         if (Objects.isNull(reqVo.getEntPid())) {
             RegisterReqDto registerReqDto = new RegisterReqDto();
@@ -517,22 +516,39 @@ public class KwsEnterpriseService {
             registerReqDto.setPhone(reqVo.getPhone());
             registerReqDto.setIsMain(Global.YES);
             registerReqDto.setSystemType(SystemTypeEnum.COMPANY.getCode());
-            kwsUserService.register(registerReqDto);
+            RegisterResDto register = kwsUserService.register(registerReqDto);
 
-            /*2、认证*/
             EntRegisterReqVo entRegisterReqVo = new EntRegisterReqVo();
             BeanUtils.copyProperties(reqVo, entRegisterReqVo);
-            entRegisterReqVo.setEntId(entId);
+            entRegisterReqVo.setEntId(register.getEntId());
             register(entRegisterReqVo);
 
             ApprovalReqVo approvalReqVo = new ApprovalReqVo();
-            approvalReqVo.setEntId(entId);
+            approvalReqVo.setEntId(register.getEntId());
             approvalReqVo.setStatus(ApprovalEnum.OK.getCode());
             approval(approvalReqVo);
             return;
         }
 
         //主体机构
+        extracted(reqVo, new IdWorker(1L).nextId());
+    }
+
+
+    private void extracted(AddEntSettleReqVo reqVo, Long entId) {
+        KwsEnterprise kwsEnterprise = new KwsEnterprise();
+        kwsEnterprise.setId(entId);
+        kwsEnterprise.setCode("");
+        kwsEnterprise.setFirmName(reqVo.getFirmName());
+        kwsEnterprise.setApproval(ApprovalEnum.NO.getCode());
+        kwsEnterprise.setContacts(reqVo.getContacts());
+        kwsEnterprise.setPhone(reqVo.getPhone());
+        kwsEnterprise.setCreateBy(LoginUserHolder.getUserId());
+        kwsEnterprise.setUpdateBy(LoginUserHolder.getUserId());
+        if (kwsEnterpriseDao.insert(kwsEnterprise) <= 0) {
+            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
+        }
+
         EntRegisterReqVo entRegisterReqVo = new EntRegisterReqVo();
         BeanUtils.copyProperties(reqVo, entRegisterReqVo);
         entRegisterReqVo.setEntId(entId);