账单模块：新增参数校验

background-common/src/main/java/cn/kdan/compdf/enums/ResponseEnum.java

@@ -17,6 +17,10 @@ public enum ResponseEnum {
     OLDPWD_EQUALS_NEWPWD("706","旧密码不能和新密码相同"),
     PROJECT_NULL("707","Project name cannot be blank."),
 
+    ERROR_BILL_EMAIL_NULL("708","Email 为空"),
+    ERROR_INCOMPLETE_BILLING_INFORMATION("709","需要完善账单信息后进行申请开票"),
+    ERROR_NEW_NAME_CANNOT_BE_EMPTY("710","新名称不能为空"),
+
     SYSTEM_ERROR("500","系统内部异常"),
 
     ;

background-user/src/main/java/cn/kdan/compdf/controller/v1/BackgroundUserController.java

@@ -6,16 +6,21 @@ import cn.kdan.compdf.dto.LoginDTO;
 import cn.kdan.compdf.dto.LoginUser;
 import cn.kdan.compdf.dto.LoginUserDTO;
 import cn.kdan.compdf.enums.AuthEnum;
+import cn.kdan.compdf.enums.ResponseEnum;
+import cn.kdan.compdf.exception.CommonException;
 import cn.kdan.compdf.service.BackgroundUserService;
 import cn.kdan.compdf.service.UsersService;
 import cn.kdan.compdf.utils.TokenUtil;
 import cn.kdan.compdf.vo.LoginVO;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -83,7 +88,10 @@ public class BackgroundUserController {
     }
 
     @PostMapping("/updateName")
-    public R<Void> updateFullName(@Validated @RequestParam @NotBlank(message = "新名称不能为空") String fullName) {
+    public R<Void> updateFullName(@RequestParam String fullName) {
+        if (StringUtils.isEmpty(fullName)){
+            throw new CommonException(ResponseEnum.ERROR_NEW_NAME_CANNOT_BE_EMPTY);
+        }
         usersService.updateFullName(TokenUtil.getRequestHeader().getUsersId(),fullName);
         return R.ok();
     }

background-user/src/main/java/cn/kdan/compdf/controller/v1/UserBillingController.java

@@ -4,6 +4,8 @@ import cn.kdan.compdf.base.R;
 import cn.kdan.compdf.dto.ApplyInvoiceDTO;
 import cn.kdan.compdf.dto.BillSendEmailDTO;
 import cn.kdan.compdf.dto.UserBillingUpInfoDTO;
+import cn.kdan.compdf.enums.ResponseEnum;
+import cn.kdan.compdf.exception.CommonException;
 import cn.kdan.compdf.service.OrderCashFlowService;
 import cn.kdan.compdf.service.UserBillingInformationService;
 import cn.kdan.compdf.utils.TokenUtil;
@@ -11,6 +13,7 @@ import cn.kdan.compdf.vo.ApplyInvoiceVO;
 import cn.kdan.compdf.vo.OrderBillVo;
 import cn.kdan.compdf.vo.UserBillingInfoVO;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -66,6 +69,9 @@ public class UserBillingController {
      */
     @PostMapping("/update/email")
     public R<Void> updateUserBillingEmail(String email) {
+        if (StringUtils.isEmpty(email)) {
+            throw new CommonException(ResponseEnum.ERROR_BILL_EMAIL_NULL);
+        }
         billingInformationService.updateUserBillingEmail(TokenUtil.getRequestHeader().getUsersId(), email);
         return R.ok();
     }

background-user/src/main/java/cn/kdan/compdf/service/impl/BackgroundUserRemainServiceImpl.java

@@ -48,9 +48,9 @@ public class BackgroundUserRemainServiceImpl extends ServiceImpl<BackgroundUserR
 
     @Override
     public void userRemainSync(List<TenantAssetBalanceDTO> tenantBalance) {
-        Map<Long, List<TenantAssetBalanceDTO>> collect = tenantBalance.stream()
-                .collect(Collectors.groupingBy(TenantAssetBalanceDTO::getTenantId));
-        for (Long tenantId : collect.keySet()) {
+//        Map<Long, List<TenantAssetBalanceDTO>> collect = tenantBalance.stream()
+//                .collect(Collectors.groupingBy(TenantAssetBalanceDTO::getTenantId));
+//        for (Long tenantId : collect.keySet()) {
 //            List<BackgroundUserRemain> userRemains = this.getUserRemain(tenantId);
             for (TenantAssetBalanceDTO assetBalanceDTO : tenantBalance) {
                 this.baseMapper.updateUserRemain(assetBalanceDTO.getTenantId(),assetBalanceDTO.getAssetTypeId(),assetBalanceDTO.getAsset(),assetBalanceDTO.getStatus());
@@ -63,7 +63,7 @@ public class BackgroundUserRemainServiceImpl extends ServiceImpl<BackgroundUserR
 //            userRemain.setUsedFiles(totalFiles - fileBalance);
 //            this.baseMapper.update(userRemain, new LambdaQueryWrapper<BackgroundUserRemain>()
 //                    .eq(BackgroundUserRemain::getTenantId, tenantId));
-        }
+//        }
     }
 
     @Override

background-user/src/main/java/cn/kdan/compdf/service/impl/UserBillingInformationServiceImpl.java

@@ -10,6 +10,7 @@ import cn.kdan.compdf.dto.UserBillingUpInfoDTO;
 import cn.kdan.compdf.entity.UserBillingInformation;
 import cn.kdan.compdf.enums.ResponseEnum;
 import cn.kdan.compdf.exception.BusinessException;
+import cn.kdan.compdf.exception.CommonException;
 import cn.kdan.compdf.mapper.UserBillingInformationMapper;
 import cn.kdan.compdf.service.OrderCashFlowService;
 import cn.kdan.compdf.service.OrdersService;
@@ -153,7 +154,7 @@ public class UserBillingInformationServiceImpl extends ServiceImpl<UserBillingIn
         UserBillingInfoVO userBillingInfo = this.getUserBillingInfo(compdfkitId);
         // 发送邮箱是否填写
         if (StringUtils.isEmpty(userBillingInfo.getEmail())) {
-            throw new BusinessException(ResponseEnum.ACCOUNT_PASSWORD_WRONG);
+            throw new CommonException(ResponseEnum.ERROR_BILL_EMAIL_NULL);
         }
         // 验证信息是否完整
         for (Field field : userBillingInfo.getClass().getDeclaredFields()) {
@@ -181,6 +182,7 @@ public class UserBillingInformationServiceImpl extends ServiceImpl<UserBillingIn
         Map postForObjectMap = restTemplate.postForObject(invoiceUrl, request, Map.class);
         String billUrl = postForObjectMap.get("url").toString();
         // TODO 上传资源服务器
+
         // 持久化发票数据
         orderCashFlowService.updateBillInfo(applyInvoiceDTO.getOrderId(), billUrl, billNo, JSONObject.toJSONString(userBillingInfo));
         // 返回结果
@@ -234,11 +236,11 @@ public class UserBillingInformationServiceImpl extends ServiceImpl<UserBillingIn
         try {
             Object value = field.get(obj);
             if (value == null || value.toString().isEmpty()) {
-                throw new BusinessException(ResponseEnum.ACCOUNT_PASSWORD_WRONG);
+                throw new CommonException(ResponseEnum.ERROR_INCOMPLETE_BILLING_INFORMATION);
             }
         } catch (IllegalAccessException e) {
             log.error(e.getMessage(), e);
-            throw new BusinessException(ResponseEnum.ACCOUNT_PASSWORD_WRONG);
+            throw new CommonException(ResponseEnum.ERROR_INCOMPLETE_BILLING_INFORMATION);
         }
     }