Merge branch 'develop'

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/fdd/impl/ContractServiceImpl.java

@@ -254,25 +254,23 @@ public class ContractServiceImpl implements ContractService {
             updateSignStatus.setBRemark(resultDesc);
             updateSignStatus.setSingerTime(new Date());
 
-            if(orderNo.startsWith(FddConstant.FN)) {
-                // 乙方生成后台对应的账号
-                UserApplyTagDO userApplyTag = cooperationDao.getUserApplyTagByContractId(contractId);
-                BUserAccountVO bUserAccountVO = this.generateBackUserAccountVO(userApplyTag);
-                log.info("check apply cooperation tag, bUserAccountVO:{}", com.alibaba.fastjson2.JSONObject.toJSONString(bUserAccountVO));
-                ResultBody resultBody = backUserAccountService.insertBAccount(bUserAccountVO, null);
-                log.info(resultBody.toString());
-                if (!resultBody.getCode().equals(ResultEnum.SUCCESS.getResultCode())) {
-                    // 生成账号失败处理
-                    log.info("生成失败");
-                    throw new BizException(ResultEnum.COOPERATION_CHECK_NOT_PASS_ERROR);
-                }
-                SmsUtil.sendPassCooperationApply(bUserAccountVO.getPhoneNum());
-            }
+//            if(orderNo.startsWith(FddConstant.FN)) {
+//                // 乙方生成后台对应的账号
+//                UserApplyTagDO userApplyTag = cooperationDao.getUserApplyTagByContractId(contractId);
+//                BUserAccountVO bUserAccountVO = this.generateBackUserAccountVO(userApplyTag);
+//                log.info("check apply cooperation tag, bUserAccountVO:{}", com.alibaba.fastjson2.JSONObject.toJSONString(bUserAccountVO));
+//                ResultBody resultBody = backUserAccountService.insertBAccount(bUserAccountVO, null);
+//                log.info(resultBody.toString());
+//                if (!resultBody.getCode().equals(ResultEnum.SUCCESS.getResultCode())) {
+//                    // 生成账号失败处理
+//                    log.info("生成失败");
+//                    throw new BizException(ResultEnum.COOPERATION_CHECK_NOT_PASS_ERROR);
+//                }
+//                SmsUtil.sendPassCooperationApply(bUserAccountVO.getPhoneNum());
+//            }
             // 同步订单状态
             ContractInfoDTO contractInfoDTO = contractInfoDO.buildContractInfoDTO();
             contractInfoDTO.setSignStatus(4);
-            log.info("到达mq");
-            log.info("到达mq");
             mqProducer.sentFinishOrderSign(contractInfoDTO);
         } else if (contractInfoDO.getSignStatus() == 2 && FddConstant.SIGN_FAIL.equals(resultCode) && contractInfoDO.getBTransactionId().equals(transactionId)) {
             // 乙方公司签章失败

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/CooperationServiceImpl.java

@@ -210,6 +210,15 @@ public class CooperationServiceImpl implements CooperationService {
                 userTagDO.setCooperationTagId(userApplyTag.getCooperationTagId());
                 cooperationDao.insertUserTag(userTagDO);
             }
+            // 审批通过生成后台对应的账号
+            BUserAccountVO bUserAccountVO = this.generateBackUserAccountVO(userApplyTag);
+            log.info("check apply cooperation tag, bUserAccountVO:{}", JSONObject.toJSONString(bUserAccountVO));
+            ResultBody resultBody = backUserAccountService.insertBAccount(bUserAccountVO, null);
+            if (!resultBody.getCode().equals(ResultEnum.SUCCESS.getResultCode())) {
+                // 生成账号失败处理
+                throw new BizException(ResultEnum.COOPERATION_CHECK_NOT_PASS_ERROR);
+            }
+            SmsUtil.sendPassCooperationApply(bUserAccountVO.getPhoneNum());
         } else {
             SmsUtil.sendNotPassCooperationApply(account.getPhoneNum());
             cooperationDao.updateApplyTagStatus(id, 2);

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 8e5d222f6c6a90b1782f79aa5664f0a2307c7410
+  newTag: ff5a5c0c19280fd1e4cf559711f86eec00304dd3