信用额度修改

crmeb-front/src/main/java/com/zbkj/front/controller/UserController.java

@@ -91,7 +91,7 @@ public class UserController {
         if (userService.logoff()) {
             return CommonResult.success();
         }
-        return CommonResult.failed();
+        return CommonResult.failed("已用额度不为零，需还清后才能注销");
     }
 }
 

crmeb-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java

@@ -23,6 +23,7 @@ import com.zbkj.common.model.bill.UserBill;
 import com.zbkj.common.model.system.TaskMessage;
 import com.zbkj.common.model.user.User;
 import com.zbkj.common.model.user.UserBalanceRecord;
+import com.zbkj.common.model.user.UserEnterprise;
 import com.zbkj.common.model.user.UserIntegralRecord;
 import com.zbkj.common.page.CommonPage;
 import com.zbkj.common.request.*;
@@ -48,7 +49,6 @@ import java.util.stream.Collectors;
 
 /**
  * 用户表 服务实现类
-
  */
 @Service
 public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserService {
@@ -92,6 +92,8 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
     private UserMerchantCollectService userMerchantCollectService;
     @Autowired
     private TaskMessageService taskMessageService;
+    @Autowired
+    private UserEnterpriseService userEnterpriseService;
 
     /**
      * 手机号注册用户
@@ -864,8 +866,8 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
     /**
      * 支付成功，用户信息变更
      *
-     * @param id           用户id
-     * @param isPromoter   是否成为推广员
+     * @param id         用户id
+     * @param isPromoter 是否成为推广员
      */
     @Override
     public Boolean paySuccessChange(Integer id, Boolean isPromoter) {
@@ -1095,8 +1097,9 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
 
     /**
      * 更新用户连续签到天数
+     *
      * @param day 连续签到天数
-     * @param id 用户ID
+     * @param id  用户ID
      * @return Boolean
      */
     @Override
@@ -1154,6 +1157,16 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
         user.setTagId("");
         user.setIsPromoter(false);
 
+        LambdaQueryWrapper<UserEnterprise> enterpriseLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        enterpriseLambdaQueryWrapper.eq(UserEnterprise::getUserId, user.getId());
+        UserEnterprise one = userEnterpriseService.getOne(enterpriseLambdaQueryWrapper);
+        BigDecimal usedLineOfCredit = one.getUsedLineOfCredit();
+        int i = usedLineOfCredit.compareTo(BigDecimal.valueOf(0));
+        if (i > 0) {
+            return false;
+        }
+
+
         Boolean execute = transactionTemplate.execute(e -> {
             userTokenService.deleteByUid(user.getId());
             cartService.deleteByUid(user.getId());
@@ -1178,12 +1191,14 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
         if (!execute) {
             throw new CrmebException("用户注销失败");
         }
+
         tokenComponent.logout(RequestUtil.getRequest());
         return execute;
     }
 
     /**
      * 管理端用户详情
+     *
      * @param id 用户ID
      */
     @Override
@@ -1208,7 +1223,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
     public void savePhone(List<User> users, SystemAdmin systemAdmin) {
         for (User user : users) {
             TaskMessage taskMessage = new TaskMessage();
-            taskMessage.setId(UUID.randomUUID().toString().replace("-",""));
+            taskMessage.setId(UUID.randomUUID().toString().replace("-", ""));
             taskMessage.setIsMessage("1");
             taskMessage.setMerId(systemAdmin.getMerId());
             taskMessage.setUid(user.getId());
@@ -1224,6 +1239,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
 
     /**
      * 批量清除用户推广人
+     *
      * @param spreadUid 推广人id
      */
     private Boolean batchRemoveSpreadUid(Integer spreadUid) {