出账检核-增加币种59

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

@@ -384,41 +384,33 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
             // 校验发佣记录状态
             // 校验发佣记录状态
             StringBuilder validateMsg = new StringBuilder();
             StringBuilder validateMsg = new StringBuilder();
             for (Fortune fortune : fortuneList) {
             for (Fortune fortune : fortuneList) {
-                // 统一加一个换行符开始
-                validateMsg.append("<br>");
-
                 if (StringUtils.isNotBlank(fortune.getFortuneAccountBizId())) {
                 if (StringUtils.isNotBlank(fortune.getFortuneAccountBizId())) {
-                    validateMsg.append("保单").append(fortune.getPolicyNo()).append("-").append(fortune.getBroker())
-                            .append("：已发薪资，不能重复生成").append("<br>");
+                    validateMsg.append("➖ ").append("保单").append(fortune.getPolicyNo()).append("-").append(fortune.getBroker())
+                            .append("：已发薪资，不能重复生成").append("  ");
                 }
                 }
                 if (StringUtils.equals(fortune.getStatus(), FortuneStatusEnum.WAIT.getItemValue())) {
                 if (StringUtils.equals(fortune.getStatus(), FortuneStatusEnum.WAIT.getItemValue())) {
-                    validateMsg.append("保单").append(fortune.getPolicyNo()).append("-").append(fortune.getBroker())
-                            .append("：待出账状态不能直接改为'可出账, 检核完成'").append("<br>");
+                    validateMsg.append("➖ ").append("保单").append(fortune.getPolicyNo()).append("-").append(fortune.getBroker())
+                            .append("：待出账状态不能直接改为'可出账, 检核完成'").append("  ");
                 }
                 }
                 if (StringUtils.equals(fortune.getStatus(), FortuneStatusEnum.SENT.getItemValue())) {
                 if (StringUtils.equals(fortune.getStatus(), FortuneStatusEnum.SENT.getItemValue())) {
-                    validateMsg.append("保单").append(fortune.getPolicyNo()).append("-").append(fortune.getBroker())
-                            .append("：已完成出账").append("<br>");
+                    validateMsg.append("➖ ").append("保单").append(fortune.getPolicyNo()).append("-").append(fortune.getBroker())
+                            .append("：已完成出账").append("  ");
                 }
                 }
                 if (fortune.getActualPayoutDate() == null) {
                 if (fortune.getActualPayoutDate() == null) {
-                    validateMsg.append("保单").append(fortune.getPolicyNo()).append("-").append(fortune.getBroker())
-                            .append("：未设置出账年月（实）").append("<br>");
+                    validateMsg.append("➖ ").append("保单").append(fortune.getPolicyNo()).append("-").append(fortune.getBroker())
+                            .append("：未设置出账年月（实）").append("  ");
                 }
                 }
                 if (ObjectUtils.isEmpty(fortune.getPayoutCurrency())) {
                 if (ObjectUtils.isEmpty(fortune.getPayoutCurrency())) {
-                    validateMsg.append("保单").append(fortune.getPolicyNo()).append("-").append(fortune.getBroker())
-                            .append("：未设置发放币种").append("<br>");
+                    validateMsg.append("➖ ").append("保单").append(fortune.getPolicyNo()).append("-").append(fortune.getBroker())
+                            .append("：未设置发放币种").append("  ");
                 }
                 }
                 if (ObjectUtils.isEmpty(fortune.getPayoutAmount())) {
                 if (ObjectUtils.isEmpty(fortune.getPayoutAmount())) {
-                    validateMsg.append("保单").append(fortune.getPolicyNo()).append("-").append(fortune.getBroker())
-                            .append("：未设置发放币种金额").append("<br>");
+                    validateMsg.append("➖ ").append("保单").append(fortune.getPolicyNo()).append("-").append(fortune.getBroker())
+                            .append("：未设置发放币种金额").append("  ");
                 }
                 }
             }
             }
             if (StringUtils.isNotBlank(validateMsg.toString())) {
             if (StringUtils.isNotBlank(validateMsg.toString())) {
-                // 去掉最开头的那个多余的换行符
-                String finalMsg = validateMsg.toString();
-                if (finalMsg.startsWith("<br>")) {
-                    finalMsg = finalMsg.substring(5);
-                }
-                throw new BusinessException(ResultCode.FAIL.getCode(), finalMsg);
+                throw new BusinessException(ResultCode.FAIL.getCode(), validateMsg.toString());
             }
             }
 
 
             if (CollUtil.isNotEmpty(fortuneList)) {
             if (CollUtil.isNotEmpty(fortuneList)) {