Merge branch 'master' into wrq_dev

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

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.core.base.BaseController;
@@ -21,8 +22,8 @@ import com.jzg.organization.mapper.SysUserJzgInfoBankCardRecordMapper;
 import com.jzg.organization.service.SysUserJzgInfoBankCardService;
 import com.jzg.organization.service.SysUserJzgInfoSalesmanService;
 import jakarta.annotation.Resource;
-import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -172,15 +173,17 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
 
     @Override
     public boolean setDefaultCard(SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo) {
-        List<SysUserJzgInfoBankCard> sysUserJzgInfoBankCardList = sysUserJzgInfoBankCardMapper
-                .selectList(new LambdaQueryWrapper<SysUserJzgInfoBankCard>().eq(SysUserJzgInfoBankCard::getUserInfoId, sysUserJzgInfoBankCardVo.getUserId()));
-        sysUserJzgInfoBankCardList.forEach(sysUserJzgInfoBankCard -> {
-            sysUserJzgInfoBankCard.setDefault(false);
-            sysUserJzgInfoBankCardMapper.updateById(sysUserJzgInfoBankCard);
-        });
-        SysUserJzgInfoBankCard sysUserJzgInfoBankCard = sysUserJzgInfoBankCardMapper.selectById(sysUserJzgInfoBankCardVo.getId());
-        sysUserJzgInfoBankCard.setDefault(true);
-        return sysUserJzgInfoBankCardMapper.updateById(sysUserJzgInfoBankCard) > 0;
+        // 1. 将该用户所有银行卡取消默认（批量更新，避免逐条 updateById 受 FieldStrategy 影响）
+        LambdaUpdateWrapper<SysUserJzgInfoBankCard> cancelWrapper = new LambdaUpdateWrapper<>();
+        cancelWrapper.eq(SysUserJzgInfoBankCard::getUserInfoId, sysUserJzgInfoBankCardVo.getUserId())
+                .setSql("is_default = 0");
+        sysUserJzgInfoBankCardMapper.update(null, cancelWrapper);
+
+        // 2. 将目标卡设为默认
+        LambdaUpdateWrapper<SysUserJzgInfoBankCard> setWrapper = new LambdaUpdateWrapper<>();
+        setWrapper.eq(SysUserJzgInfoBankCard::getId, sysUserJzgInfoBankCardVo.getId())
+                .setSql("is_default = 1");
+        return sysUserJzgInfoBankCardMapper.update(null, setWrapper) > 0;
     }
 
     @Override

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

@@ -442,9 +442,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         //调试时候用 万能密码
         if (!password.equals("Aa159357")) {
             // 对比密码
-            if (!encryptedPassword.equals(user.getPassword())) {
-                return false;
-            }
+            return encryptedPassword.equals(user.getPassword());
         }
         return true;
     }
@@ -910,13 +908,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUserJzgInfoBankCard.setAuditTime(null);
             // 设置为默认卡
             if (sysUserJzgInfoBankCardVo.isDefault()) {
-                List<SysUserJzgInfoBankCard> defaultList = sysUserJzgInfoBankCardService
-                        .list(new LambdaQueryWrapper<SysUserJzgInfoBankCard>()
-                                .eq(SysUserJzgInfoBankCard::getUserInfoId, sysUserJzgInfo.getId()));
-                for (SysUserJzgInfoBankCard card : defaultList) {
-                    card.setDefault(false);
-                    sysUserJzgInfoBankCardService.updateById(card);
-                }
+                sysUserJzgInfoBankCardService.lambdaUpdate()
+                        .eq(SysUserJzgInfoBankCard::getUserInfoId, sysUserJzgInfo.getId())
+                        .setSql("is_default = 0")
+                        .update();
                 sysUserJzgInfoBankCard.setDefault(true);
             }
 
@@ -942,12 +937,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         sysUserJzgInfoBankCard.setUserInfoId(sysUserJzgInfo.getId());
         sysUserJzgInfoBankCard.setSystemCode(systemCode);
         if (sysUserJzgInfoBankCardVo.isDefault()) {
-            List<SysUserJzgInfoBankCard> sysUserJzgInfoBankCardList = sysUserJzgInfoBankCardService
-                    .list(new LambdaQueryWrapper<SysUserJzgInfoBankCard>().eq(SysUserJzgInfoBankCard::getUserInfoId, sysUserJzgInfo.getUserId()));
-            for (SysUserJzgInfoBankCard sysUserJzgInfoBankCard1 : sysUserJzgInfoBankCardList) {
-                sysUserJzgInfoBankCard1.setDefault(false);
-                sysUserJzgInfoBankCardService.updateById(sysUserJzgInfoBankCard1);
-            }
+            sysUserJzgInfoBankCardService.lambdaUpdate()
+                    .eq(SysUserJzgInfoBankCard::getUserInfoId, sysUserJzgInfo.getUserId())
+                    .setSql("is_default = 0")
+                    .update();
             sysUserJzgInfoBankCard.setDefault(true);
         }
         sysUserJzgInfoBankCard.setApplyTime(LocalDateTime.now().toString());
@@ -1292,9 +1285,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             List<SysUserJzgInfoFile> collect = fileList.stream()
                     .filter(x -> x.getId().equals(fileId) && x.getFileType().equals(fileType))
                     .collect(Collectors.toList());
-            if (collect.size() > 0) {
-                return false;
-            }
+            return collect.size() <= 0;
         } else {
             //如果传入的文件id为空  ， 判断是否存在文件 如果存在则删除
             List<SysUserJzgInfoFile> collect = fileList.stream()
@@ -1305,8 +1296,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             }
             return false;
         }
-
-        return true;
     }
 
     @Deprecated
@@ -1471,7 +1460,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public boolean partnerReview(List<String> userInfoId, String reviewStatus,String userId) {
         int row = sysUserJzgInfoService.partnerReview(userInfoId,reviewStatus, userId);
-        boolean b = row > 0 ? true : false;
+        boolean b = row > 0;
         if (b){
             CompletableFuture.runAsync(() -> {
                 try {