Merge remote-tracking branch 'origin/dev' into prod

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiExpectedFortuneServiceImpl.java

@@ -1274,16 +1274,14 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
         ExpectedFortune updateExpectedFortune = new ExpectedFortune();
         BeanUtils.copyProperties(request, updateExpectedFortune);
         updateExpectedFortune.setId(expectedFortune.getId());
-        // 默认结算汇率
-        updateExpectedFortune.setDefaultExchangeRate(
-                queryExchangeRateByFeign(
-                        updateExpectedFortune.getCurrency(),
-                        "HKD"
-                ));
+
+        // 如果金额变更，则需要重新计算港币金额和待出账金额
+        if (ObjectUtils.notEqual(expectedFortune.getHkdAmount(), request.getHkdAmount())) {
             // 计算港币金额
-        updateExpectedFortune.setHkdAmount(updateExpectedFortune.getAmount().multiply(updateExpectedFortune.getDefaultExchangeRate()));
+            updateExpectedFortune.setHkdAmount(request.getHkdAmount());
             // 更新待出账金额
-        updateExpectedFortune.setUnpaidAmount(updateExpectedFortune.getHkdAmount());
+            updateExpectedFortune.setUnpaidAmount(request.getHkdAmount());
+        }
         // 获取当前登录用户
         AuthUserDto currentLoginUser = SecurityUtil.getCurrentLoginUser();
         String loginUserId = currentLoginUser.getId().toString();

yd-csf-feign/src/main/java/com/yd/csf/feign/request/expectedfortune/ExpectedFortuneUpdateRequest.java

@@ -36,10 +36,10 @@ public class ExpectedFortuneUpdateRequest {
     private LocalDate actualPayoutDate;
 
     /**
-     * 出账金额
+     * 港币出账金额
      */
-    @Schema(description = "出账金额")
-    private BigDecimal amount;
+    @Schema(description = "港币出账金额")
+    private BigDecimal hkdAmount;
 
     /**
      * 出账状态

yd-csf-service/src/main/java/com/yd/csf/service/helper/SpeciesConditionMatcher.java

@@ -79,10 +79,10 @@ public class SpeciesConditionMatcher {
                 BigDecimal min = new BigDecimal(left);
                 return actual.compareTo(min) > 0;
             } else {
-                // "0-10" 表示 (0, 10]
+                // "0-10" 表示 [0, 10]
                 BigDecimal min = new BigDecimal(left);
                 BigDecimal max = new BigDecimal(right);
-                return actual.compareTo(min) > 0 && actual.compareTo(max) <= 0;
+                return actual.compareTo(min) >= 0 && actual.compareTo(max) <= 0;
             }
         } catch (Exception e) {
             return false;

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

@@ -983,11 +983,6 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
             throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "来佣记录不存在");
         }
 
-        CommissionExpected commissionExpected = commissionExpectedService.getByBizId(commission.getCommissionExpectedBizId());
-        if (commissionExpected != null) {
-            throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "预计来佣已存在");
-        }
-
         // 获取当前登录用户
         AuthUserDto currentLoginUser = SecurityUtil.getCurrentLoginUser();
         String loginUserId = currentLoginUser.getId().toString();
@@ -995,16 +990,9 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         CommissionExpected expected = new CommissionExpected();
         BeanUtils.copyProperties(commission, expected, "id", "remark");
         expected.setCommissionExpectedBizId(RandomStringGenerator.generateBizId16("commission_expected"));
+        expected.setPremium(new BigDecimal(commission.getPremium()));
+        expected.setCommissionRatio(commission.getCurrentCommissionRatio());
 
-        if (ObjectUtils.isEmpty(commission.getReconciliationCompanyCode())) {
-            if (ObjectUtils.isEmpty(commission.getReconciliationCompanyBizId())) {
-                throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "来佣记录未关联对账公司");
-            }
-            // 调用对账公司 feignclient，查询对账公司编码
-            String reconciliationCompanyCode = policyFollowService.queryReconciliationCompanyByFeign(commission.getReconciliationCompanyBizId());
-            expected.setReconciliationCompanyCode(reconciliationCompanyCode);
-            commission.setReconciliationCompanyCode(reconciliationCompanyCode);
-        }
         // 生成应收单编号
         expected.setReceivableNo(receivableService.generateReceivableNo(
                 commission.getCommissionBizType(),
@@ -1013,7 +1001,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         // 设置预计入账金额、已来佣金额、待入账金额
         expected.setExpectedAmount(commission.getHkdAmount());
         expected.setPaidAmount(commission.getHkdAmount());
-        expected.setPaidRatio(null);
+        expected.setPaidRatio(commission.getCurrentCommissionRatio());
         expected.setDefaultExchangeRate(commission.getExchangeRate());
         expected.setCommissionDate(commission.getCommissionDate());
         expected.setStatus(CommissionExpectedStatusEnum.COMPARED.getItemValue());

yd-csf-service/src/main/java/com/yd/csf/service/vo/FortuneVO.java

@@ -233,7 +233,7 @@ public class FortuneVO implements Serializable {
      */
     @Schema(description = "出账日(实)")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date actualPayoutDate;
+    private LocalDate actualPayoutDate;
 
     /**
      * 是否含税 0=No, 1=Yes