Merge remote-tracking branch 'origin/master'

commons/src/main/java/com/jzg/commons/entity/dto/SysUserJzgInfoBankCardDto.java

@@ -1,6 +1,6 @@
 package com.jzg.commons.entity.dto;
 
-import com.jzg.commons.entity.po.SysUserJzgInfoBankCardRecord;
+import com.jzg.commons.entity.vo.ChangeLogDetail;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -91,5 +91,5 @@ public class SysUserJzgInfoBankCardDto implements Serializable {
     private String leaderName;
 
     @Schema(description = "审核记录列表")
-    private List<SysUserJzgInfoBankCardRecord> sysUserJzgInfoBankCardRecordList;
+    private List<ChangeLogDetail> sysUserJzgInfoBankCardRecordList;
 }

commons/src/main/java/com/jzg/commons/entity/vo/ChangeLogDetail.java

@@ -26,6 +26,12 @@ public class ChangeLogDetail implements Serializable {
     @Schema(name = "审核说明")
     private String content;
 
+    @Schema(name = "银行卡ID")
+    private String bankCardId;
+
+    @Schema(name = "id")
+    private String id;
+
     public ChangeLogDetail(){
 
     }
@@ -37,4 +43,13 @@ public class ChangeLogDetail implements Serializable {
         this.content = content;
     }
 
+    public ChangeLogDetail(String title, LocalDateTime time, Boolean show, String content, String bankCardId, String id) {
+        this.title = title;
+        this.time = time;
+        this.show = show;
+        this.content = content;
+        this.bankCardId = bankCardId;
+        this.id = id;
+    }
+
 }

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

@@ -13,6 +13,7 @@ import com.jzg.commons.entity.dto.SysUserJzgInfoBankCardDto;
 import com.jzg.commons.entity.po.SysUploadFiles;
 import com.jzg.commons.entity.po.SysUserJzgInfoBankCard;
 import com.jzg.commons.entity.po.SysUserJzgInfoBankCardRecord;
+import com.jzg.commons.entity.vo.ChangeLogDetail;
 import com.jzg.commons.entity.vo.SysUserJzgInfoBankCardVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.MinioUtils;
@@ -119,7 +120,10 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
             List<SysUserJzgInfoBankCardRecord> sysUserJzgInfoBankCardRecordList = sysUserJzgInfoBankCardRecordMapper
                     .selectList(new LambdaQueryWrapper<SysUserJzgInfoBankCardRecord>()
                             .eq(SysUserJzgInfoBankCardRecord::getBankCardId, sysUserJzgInfoBankCardDto.getId()));
-            sysUserJzgInfoBankCardDto.setSysUserJzgInfoBankCardRecordList(sysUserJzgInfoBankCardRecordList);
+            List<ChangeLogDetail> changeLogDetailList = sysUserJzgInfoBankCardRecordList.stream()
+                    .map(action -> new ChangeLogDetail(action.getDescription(), action.getCreateTime(), action.getStatus().equals("1"), action.getRemark(), action.getBankCardId(), action.getId()))
+                    .collect(Collectors.toList());
+            sysUserJzgInfoBankCardDto.setSysUserJzgInfoBankCardRecordList(changeLogDetailList);
             // 填充最新的驳回日期和驳回原因
             if(CollUtil.isNotEmpty(sysUserJzgInfoBankCardRecordList)){
                 // 过滤出状态=2的驳回记录，并按创建时间 倒序排列
@@ -173,6 +177,11 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
 
     @Override
     public boolean setDefaultCard(SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo) {
+        SysUserJzgInfoBankCard bankCard = sysUserJzgInfoBankCardMapper.selectById(sysUserJzgInfoBankCardVo.getId());
+        if (bankCard.getAuditStatus() != 1) {
+            throw new SystemException("该银行卡未审核通过");
+        }
+
         // 1. 将该用户所有银行卡取消默认（批量更新，避免逐条 updateById 受 FieldStrategy 影响）
         LambdaUpdateWrapper<SysUserJzgInfoBankCard> cancelWrapper = new LambdaUpdateWrapper<>();
         cancelWrapper.eq(SysUserJzgInfoBankCard::getUserInfoId, sysUserJzgInfoBankCardVo.getUserId())