前端对接问题修复69

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiFortuneController.java

@@ -202,10 +202,9 @@ public class ApiFortuneController {
         if (CollectionUtils.isEmpty(fortuneDownloadRequest.getFortuneBizIdList())) {
         if (CollectionUtils.isEmpty(fortuneDownloadRequest.getFortuneBizIdList())) {
             throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "请选择要出账的发佣数据");
             throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "请选择要出账的发佣数据");
         }
         }
-        try {
-            fortuneService.downloadAccount(fortuneDownloadRequest, response);
-            return Result.success(true);
-        } catch (Exception e) {
+
+        fortuneService.downloadAccount(fortuneDownloadRequest, response);
+
 //            // 设置响应类型为 JSON，而不是文件流
 //            // 设置响应类型为 JSON，而不是文件流
 //            response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
 //            response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
 //            response.setContentType(MediaType.APPLICATION_JSON_VALUE);
 //            response.setContentType(MediaType.APPLICATION_JSON_VALUE);
@@ -218,11 +217,10 @@ public class ApiFortuneController {
 //
 //
 //            response.getWriter().write(new ObjectMapper().writeValueAsString(errorResult));
 //            response.getWriter().write(new ObjectMapper().writeValueAsString(errorResult));
 
 
-            log.error("生成出账清单失败", e);
-            return Result.success(false);
-        }
+        return Result.success(true);
     }
     }
 
 
+
     /**
     /**
      * 分页获取出账列表
      * 分页获取出账列表
      *
      *

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FortuneServiceImpl.java

@@ -187,6 +187,9 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
             if (currentPaymentAmount.compareTo(expectedFortune.getAmount()) > 0) {
             if (currentPaymentAmount.compareTo(expectedFortune.getAmount()) > 0) {
                 throw new BusinessException(ResultCode.PARAM_CHECK_ERROR.getCode(), "出账金额不能大于应付款金额");
                 throw new BusinessException(ResultCode.PARAM_CHECK_ERROR.getCode(), "出账金额不能大于应付款金额");
             }
             }
+            if (StringUtils.isBlank(fortuneUpdateRequest.getCurrency())) {
+                throw new BusinessException(ResultCode.PARAM_CHECK_ERROR.getCode(), "出账币种不能为空");
+            }
         }
         }
 
 
         // 获取当前登录用户
         // 获取当前登录用户
@@ -319,6 +322,9 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
                 if (!StringUtils.equals(fortune.getStatus(), FortuneStatusEnum.CHECKED.getItemValue())) {
                 if (!StringUtils.equals(fortune.getStatus(), FortuneStatusEnum.CHECKED.getItemValue())) {
                     validateMsg.append(fortune.getPolicyNo()).append("-").append(fortune.getBroker()).append("未检核，不能生成出账记录; ");
                     validateMsg.append(fortune.getPolicyNo()).append("-").append(fortune.getBroker()).append("未检核，不能生成出账记录; ");
                 }
                 }
+                if (StringUtils.equals(fortune.getStatus(), FortuneStatusEnum.SENT.getItemValue())) {
+                    validateMsg.append(fortune.getPolicyNo()).append("-").append(fortune.getBroker()).append("已完成出账，不能生成出账记录; ");
+                }
             }
             }
             if (StringUtils.isNotBlank(validateMsg.toString())) {
             if (StringUtils.isNotBlank(validateMsg.toString())) {
                 throw new BusinessException(ResultCode.FAIL.getCode(), validateMsg.toString());
                 throw new BusinessException(ResultCode.FAIL.getCode(), validateMsg.toString());