银行卡驳回后修改

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

@@ -29,6 +29,7 @@ import com.jzg.organization.service.*;
 import com.jzg.organization.state.UserState;
 import com.jzg.organization.state.listener.UserStateListener;
 import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.Setter;
 import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;
@@ -40,6 +41,9 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -790,18 +794,26 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUserJzgInfoFile.setFileType("bankcard");
             sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
         }
+        String systemCode = baseController.getUserSystemCode();
+        if (systemCode.equals("APP")) {
+            RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
+            HttpServletRequest request = ((ServletRequestAttributes) requestAttributes).getRequest();
+            systemCode = request.getHeader("system_code");
+        }
         // 提交卡号为驳回状态 重新提交
         SysUserJzgInfoBankCard rejectBankCard = sysUserJzgInfoBankCardService
                 .getOne(new LambdaQueryWrapper<SysUserJzgInfoBankCard>()
                         .eq(SysUserJzgInfoBankCard::getBankCardNumber, sysUserJzgInfoBankCardVo.getBankCardNumber())
                         .eq(SysUserJzgInfoBankCard::getUserInfoId, sysUserJzgInfo.getId())
-                        .eq(SysUserJzgInfoBankCard::getSystemCode, baseController.getUserSystemCode())
+                        .eq(SysUserJzgInfoBankCard::getSystemCode, systemCode)
                         .eq(SysUserJzgInfoBankCard::getAuditStatus, 2));
         if (rejectBankCard != null) {
+            sysUserJzgInfoBankCardVo.setId(rejectBankCard.getId());
             BeanUtils.copyProperties(sysUserJzgInfoBankCardVo, rejectBankCard);
+
             rejectBankCard.setFileId(fileId);
             rejectBankCard.setAuditStatus(0);
-            rejectBankCard.setSystemCode(baseController.getUserSystemCode());
+            rejectBankCard.setSystemCode(systemCode);
             // 设置为默认卡
             if (sysUserJzgInfoBankCardVo.isDefault()) {
                 List<SysUserJzgInfoBankCard> defaultList = sysUserJzgInfoBankCardService
@@ -816,17 +828,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
             // 更新驳回的银行卡
             sysUserJzgInfoBankCardService.updateById(rejectBankCard);
-
             // 添加重新提交记录
             SysUserJzgInfoBankCardRecord record = new SysUserJzgInfoBankCardRecord(rejectBankCard.getId(), "驳回后重新提交");
             record.setStatus("0");
+            record.setBankCardId(sysUserJzgInfoBankCardVo.getBankCardNumber());
             sysUserJzgInfoBankCardRecordService.save(record);
 
             return HttpResult.ok("重新提交银行卡成功，等待审核");
         }
         SysUserJzgInfoBankCard verifyBankCard = sysUserJzgInfoBankCardService
                 .getOne(new LambdaQueryWrapper<SysUserJzgInfoBankCard>().eq(SysUserJzgInfoBankCard::getBankCardNumber, sysUserJzgInfoBankCardVo.getBankCardNumber())
-                        .eq(SysUserJzgInfoBankCard::getSystemCode, baseController.getUserSystemCode()));
+                        .eq(SysUserJzgInfoBankCard::getSystemCode, systemCode));
         if (verifyBankCard != null) {
             return HttpResult.error("该租户下银行卡已存在");
         }
@@ -834,7 +846,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         BeanUtils.copyProperties(sysUserJzgInfoBankCardVo, sysUserJzgInfoBankCard);
         sysUserJzgInfoBankCard.setFileId(fileId);
         sysUserJzgInfoBankCard.setUserInfoId(sysUserJzgInfo.getId());
-        sysUserJzgInfoBankCard.setSystemCode(sysUserJzgInfo.getSystemCode());
+        sysUserJzgInfoBankCard.setSystemCode(systemCode);
         if (sysUserJzgInfoBankCardVo.isDefault()) {
             List<SysUserJzgInfoBankCard> sysUserJzgInfoBankCardList = sysUserJzgInfoBankCardService
                     .list(new LambdaQueryWrapper<SysUserJzgInfoBankCard>().eq(SysUserJzgInfoBankCard::getUserInfoId, sysUserJzgInfo.getUserId()));