Merge remote-tracking branch 'origin/test' into test

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

@@ -37,10 +37,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 /**
 /**
@@ -529,8 +526,7 @@ public class ApiFortuneController {
         // 查询列表数据
         // 查询列表数据
         QueryWrapper<Fortune> queryWrapper = new QueryWrapper<>();
         QueryWrapper<Fortune> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("expected_fortune_biz_id", fortuneQueryRequest.getExpectedFortuneBizId());
         queryWrapper.eq("expected_fortune_biz_id", fortuneQueryRequest.getExpectedFortuneBizId());
-        queryWrapper.eq("status", FortuneStatusEnum.SENT.getItemValue());
-        queryWrapper.or().eq("status", FortuneStatusEnum.CHECKED.getItemValue());
+        queryWrapper.in("status", Arrays.asList(FortuneStatusEnum.CHECKED.getItemValue(), FortuneStatusEnum.SENT.getItemValue()));
         Page<Fortune> fortunePage = fortuneService.page(new Page<>(current, size),
         Page<Fortune> fortunePage = fortuneService.page(new Page<>(current, size),
                 queryWrapper);
                 queryWrapper);
         // 组装返回值
         // 组装返回值

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

@@ -287,10 +287,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
         main.setReconciliationOperator(currentLoginUser.getUsername());
         main.setReconciliationOperator(currentLoginUser.getUsername());
         main.setUpdaterId(loginUserId);
         main.setUpdaterId(loginUserId);
         main.setUpdateTime(new Date());
         main.setUpdateTime(new Date());
-        // 其他字段更新
-        if (StringUtils.isNotBlank(fortuneUpdateRequest.getCurrency())) {
-            main.setCurrency(fortuneUpdateRequest.getCurrency());
-        }
+
         this.updateById(main);
         this.updateById(main);
 
 
         // 2. 剩余金额生成新行
         // 2. 剩余金额生成新行
@@ -303,7 +300,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
             part.setCurrentPaymentHkdAmount(leftAmount);
             part.setCurrentPaymentHkdAmount(leftAmount);
             part.setCurrentPaymentRatio(leftAmount
             part.setCurrentPaymentRatio(leftAmount
                     .divide(expectedFortune.getHkdAmount(), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)));
                     .divide(expectedFortune.getHkdAmount(), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)));
-            part.setStatus(FortuneStatusEnum.WAIT.getItemValue());
+            part.setStatus(FortuneStatusEnum.RESERVED.getItemValue());
             part.setIsPart(1);
             part.setIsPart(1);
             part.setPayoutDate(LocalDate.now().plusMonths(1)); // 次月
             part.setPayoutDate(LocalDate.now().plusMonths(1)); // 次月
             part.setReconciliationOperator(currentLoginUser.getUsername());
             part.setReconciliationOperator(currentLoginUser.getUsername());
@@ -368,9 +365,9 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
             // 校验发佣记录状态
             // 校验发佣记录状态
             StringBuilder validateMsg = new StringBuilder();
             StringBuilder validateMsg = new StringBuilder();
             for (Fortune fortune : fortuneList) {
             for (Fortune fortune : fortuneList) {
-//                if (StringUtils.equals(fortune.getStatus(), FortuneStatusEnum.CAN_SEND.getItemValue())) {
-//                    validateMsg.append(fortune.getPolicyNo()).append("-").append(fortune.getBroker()).append("当前未检核，请检核后再生成出账记录; ");
-//                }
+                if (!StringUtils.equals(fortune.getStatus(), FortuneStatusEnum.CAN_SEND.getItemValue())) {
+                    validateMsg.append(fortune.getPolicyNo()).append("-").append(fortune.getBroker()).append("当前状态不是'可出账, 待检核'，不能生成出账记录; ");
+                }
                 if (StringUtils.equals(fortune.getStatus(), FortuneStatusEnum.SENT.getItemValue())) {
                 if (StringUtils.equals(fortune.getStatus(), FortuneStatusEnum.SENT.getItemValue())) {
                     validateMsg.append(fortune.getPolicyNo()).append("-").append(fortune.getBroker()).append("已完成出账，不能生成出账记录; ");
                     validateMsg.append(fortune.getPolicyNo()).append("-").append(fortune.getBroker()).append("已完成出账，不能生成出账记录; ");
                 }
                 }