Merge branch 'dev_jzg_lipf_v20260901'

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserAccountServiceImpl.java

@@ -454,8 +454,8 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                     if("0".equals(action.getIncomeAndExpense())){
                         // 保费收入
                         stepList.add(new ChangeLogDetail("费用审核通过",action.getCreateTime(),true, null));
-                        stepList.add(new ChangeLogDetail());
-                        stepList.add(new ChangeLogDetail());
+//                        stepList.add(new ChangeLogDetail());
+//                        stepList.add(new ChangeLogDetail());
                     }
                 }else if("2".equals(action.getStatus())){
                     stepList.add(new ChangeLogDetail("提交提现申请",action.getCreateTime(),true, null));

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserJzgInfoBankCardServiceImpl.java

@@ -122,7 +122,12 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
             for (int i = 0; i < size; i++) {
                 SysUserJzgInfoBankCardRecord action = sysUserJzgInfoBankCardRecordList.get(i);
                 // 只有最后一条记录按实际状态设置，前面的记录默认展示为成功
-                boolean show = i < size - 1 || action.getStatus().equals("1");
+                Boolean show = i < size - 1 ||  action.getStatus().equals("1");
+                if("添加新卡".equals(action.getDescription()) && "0".equals(sysUserJzgInfoBankCardDto.getAuditStatus())){
+                    // 待审核的时候，显示为空。 不展示对/错
+                    show = null;
+                }
+
                 changeLogDetailList.add(new ChangeLogDetail(action.getDescription(), action.getCreateTime(), show, action.getRemark(), action.getBankCardId(), action.getId()));
             }
             sysUserJzgInfoBankCardDto.setSysUserJzgInfoBankCardRecordList(changeLogDetailList);

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -938,20 +938,21 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
-    public HttpResult addBankCard(SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo) {
-        SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getById(sysUserJzgInfoBankCardVo.getUserJzgInfoId());
+    public HttpResult addBankCard(SysUserJzgInfoBankCardVo param) {
+        log.info("添加银行卡信息：param=[{}]", JSONUtil.toJsonStr(param));
+        SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getById(param.getUserJzgInfoId());
         if (sysUserJzgInfo == null) {
             throw new SystemException("该业务员不存在");
         }
-        if (sysUserJzgInfoBankCardVo.getBankCardNumber() == null) {
-            HttpResult.error("银行卡号不能为空");
+        if (param.getBankCardNumber() == null) {
+            return HttpResult.error("银行卡号不能为空");
         }
-        String fileId = IdGenerate.nextId();
-        if (sysUserJzgInfoBankCardVo.getAttachment() != null) {
+        String id = IdGenerate.nextId();
+        if (param.getAttachment() != null) {
             SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
-                    (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, sysUserJzgInfoBankCardVo.getAttachment()));
-            SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(sysUserJzgInfoBankCardVo.getAttachment(), sysUserJzgInfoBankCardVo.getUserJzgInfoId(), sysUploadFiles.getFileName());
-            sysUserJzgInfoFile.setId(fileId);
+                    (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, param.getAttachment()));
+            SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(param.getAttachment(), param.getUserJzgInfoId(), sysUploadFiles.getFileName());
+            sysUserJzgInfoFile.setId(id);
             sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
             sysUserJzgInfoFile.setFileType("bankcard");
             sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
@@ -965,24 +966,26 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         // 提交卡号为驳回状态 重新提交
         SysUserJzgInfoBankCard rejectBankCard = sysUserJzgInfoBankCardService
                 .getOne(new LambdaQueryWrapper<SysUserJzgInfoBankCard>()
-                        .eq(SysUserJzgInfoBankCard::getBankCardNumber, sysUserJzgInfoBankCardVo.getBankCardNumber())
+                        .eq(SysUserJzgInfoBankCard::getBankCardNumber, param.getBankCardNumber())
                         .eq(SysUserJzgInfoBankCard::getUserInfoId, sysUserJzgInfo.getId())
                         .eq(SysUserJzgInfoBankCard::getSystemCode, systemCode)
                         .eq(SysUserJzgInfoBankCard::getAuditStatus, 2));
         // 重新提交需要再多加一条数据，不能修改原来那条数据的状态，原来那条数据不能动
         if (rejectBankCard != null) {
             SysUserJzgInfoBankCard sysUserJzgInfoBankCard = BeanUtil.copyProperties(rejectBankCard, SysUserJzgInfoBankCard.class);
-
             sysUserJzgInfoBankCard.setId(IdGenerate.nextId());
-            sysUserJzgInfoBankCard.setFileId(fileId);
+            sysUserJzgInfoBankCard.setFileId(id);
             sysUserJzgInfoBankCard.setAuditStatus(0);
             sysUserJzgInfoBankCard.setSystemCode(systemCode);
+            // 解决重新提交的时候，新持卡人姓名没生效的问题 add by lipf 2026年9月1日10:13:25
+            sysUserJzgInfoBankCard.setCardHolderMobile(param.getCardHolderMobile());
+            sysUserJzgInfoBankCard.setCardHolderName(param.getCardHolderName());
             // 审核时间、审核人要设置为空
             sysUserJzgInfoBankCard.setRemark(null);
             sysUserJzgInfoBankCard.setAuditBy(null);
             sysUserJzgInfoBankCard.setAuditTime(null);
             // 设置为默认卡
-            if (sysUserJzgInfoBankCardVo.isDefault()) {
+            if (param.isDefault()) {
                 sysUserJzgInfoBankCardService.lambdaUpdate()
                         .eq(SysUserJzgInfoBankCard::getUserInfoId, sysUserJzgInfo.getId())
                         .setSql("is_default = 0")
@@ -995,23 +998,23 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             // 添加重新提交记录
             SysUserJzgInfoBankCardRecord record = new SysUserJzgInfoBankCardRecord(rejectBankCard.getId(), "驳回后重新提交");
             record.setStatus("0");
-            record.setBankCardId(sysUserJzgInfoBankCardVo.getBankCardNumber());
+            record.setBankCardId(param.getBankCardNumber());
             sysUserJzgInfoBankCardRecordService.save(record);
 
             return HttpResult.ok("重新提交银行卡成功，等待审核");
         }
         SysUserJzgInfoBankCard verifyBankCard = sysUserJzgInfoBankCardService
-                .getOne(new LambdaQueryWrapper<SysUserJzgInfoBankCard>().eq(SysUserJzgInfoBankCard::getBankCardNumber, sysUserJzgInfoBankCardVo.getBankCardNumber())
+                .getOne(new LambdaQueryWrapper<SysUserJzgInfoBankCard>().eq(SysUserJzgInfoBankCard::getBankCardNumber, param.getBankCardNumber())
                         .eq(SysUserJzgInfoBankCard::getSystemCode, systemCode));
         if (verifyBankCard != null) {
             return HttpResult.error("该租户下银行卡已存在");
         }
         SysUserJzgInfoBankCard sysUserJzgInfoBankCard = new SysUserJzgInfoBankCard();
-        BeanUtils.copyProperties(sysUserJzgInfoBankCardVo, sysUserJzgInfoBankCard);
-        sysUserJzgInfoBankCard.setFileId(fileId);
+        BeanUtils.copyProperties(param, sysUserJzgInfoBankCard);
+        sysUserJzgInfoBankCard.setFileId(id);
         sysUserJzgInfoBankCard.setUserInfoId(sysUserJzgInfo.getId());
         sysUserJzgInfoBankCard.setSystemCode(systemCode);
-        if (sysUserJzgInfoBankCardVo.isDefault()) {
+        if (param.isDefault()) {
             sysUserJzgInfoBankCardService.lambdaUpdate()
                     .eq(SysUserJzgInfoBankCard::getUserInfoId, sysUserJzgInfo.getUserId())
                     .setSql("is_default = 0")