前端对接问题修复105

73dd209b · jianan · d68a8580 · 73dd209b · 73dd209b · 73dd209b
Commit 73dd209b authored Jan 09, 2026 by jianan
6 changed files
--- a/yd-csf-service/src/main/java/com/yd/csf/service/dto/FortuneStatisticsVO.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/dto/FortuneStatisticsVO.java
@@ -37,9 +37,4 @@ public class FortuneStatisticsVO {
    @Schema(description = "可出账金额")
    private BigDecimal availableOutAmount;
-    /**
-     * 差额
-     */
-    @Schema(description = "差额（待出账金额 - 可出账金额）")
-    private BigDecimal differenceAmount;
 }
--- a/yd-csf-service/src/main/java/com/yd/csf/service/model/ExpectedFortune.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/model/ExpectedFortune.java
@@ -65,6 +65,12 @@ public class ExpectedFortune implements Serializable {
    private BigDecimal premium;
    /**
+     * 保单币种
+     */
+    @TableField("policy_currency")
+    private String policyCurrency;
+    /**
     * 保险公司 ID
     */
    @TableField("insurance_company_biz_id")

--- a/yd-csf-service/src/main/java/com/yd/csf/service/model/Fortune.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/model/Fortune.java
@@ -69,6 +69,11 @@ public class Fortune implements Serializable {
    private String policyNo;
    /**
+     * 保单币种
+     */
+    private String policyCurrency;
+    /**
     * 出账期数(1=第一年; 2=第二年; 3=第三年; 4=第四年; 5=第五年)
     */
    private Integer fortunePeriod;

--- a/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionServiceImpl.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionServiceImpl.java
@@ -228,7 +228,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
        QueryWrapper<Policy> queryWrapper = new QueryWrapper<Policy>();
        queryWrapper.in("policy_no", policyNoSet);
        queryWrapper.select(
-                "policy_no", "payment_premium",
+                "policy_no", "payment_premium","currency",
                "product_launch_biz_id", "product_name",
                "insurance_company_biz_id", "insurance_company",
                "reconciliation_company", "reconciliation_company_code", "reconciliation_company_biz_id");
@@ -255,6 +255,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
            if (policy != null) {
                // 填充保费、产品名称、保险公司、对账公司
                commission.setPremium(String.valueOf(policy.getPaymentPremium()));
+                commission.setCurrency(policy.getCurrency());
                commission.setProductLaunchBizId(policy.getProductLaunchBizId());
                commission.setInsuranceCompanyBizId(policy.getInsuranceCompanyBizId());
                commission.setReconciliationCompany(policy.getReconciliationCompany());
@@ -568,32 +569,10 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
            filteredExpectedFortuneList2.add(expectedFortune);
        }
-        // 2.2 过滤掉 is_part = 1 的 fortune 记录
+        // 3. 构建实际的初始发佣记录
-//        List<Fortune> filteredFortuneList = fortuneList.stream()
-//                .filter(fortune -> Integer.valueOf(0).equals(fortune.getIsPart()))
-//                .collect(Collectors.toList());
-        // 5. 构建实际的初始发佣记录
        List<Fortune> newFortuneList = buildNewFortunes(filteredExpectedFortuneList2, commissions);
-//        List<Fortune> newFortuneList = new ArrayList<>();
-//        for (ExpectedFortune expectedFortune : filteredExpectedFortuneList) {
+        // 4. 保存发佣记录
-//            Fortune fortune = new Fortune();
-//            BeanUtils.copyProperties(expectedFortune, fortune);
-//
-//            fortune.setFortuneBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_FORTUNE.getCode()));
-//            fortune.setStatus(FortuneStatusEnum.WAIT.getItemValue());
-//            // 关联来佣业务ID
-//            matchCommission(fortune, commissionList);
-//            // 扣减已发薪资
-//            calculateCurrentFortune(fortune, policyPaidFortuneList);
-//
-//            fortune.setCreateTime(new Date());
-//            fortune.setUpdateTime(new Date());
-//
-//            newFortuneList.add(fortune);
-//        }
-        // 10. 保存发佣记录
        saveNewFortunes(newFortuneList);
        return true;
@@ -797,6 +776,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
                        commission.setProductLaunchBizId(policy.getProductLaunchBizId());
                        commission.setInsuranceCompanyBizId(policy.getInsuranceCompanyBizId());
                        commission.setPremium(Convert.toStr(policy.getPaymentPremium()));
+                        commission.setCurrency(policy.getCurrency());
                    } else {
                        throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "保单不存在, policyNo: " + request.getPolicyNo());
                    }

--- a/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FortuneServiceImpl.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FortuneServiceImpl.java
@@ -256,7 +256,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
     * 拆分发放（按本次发放金额拆）
     */
    @Transactional(rollbackFor = Exception.class)
-    public void splitFortune(Fortune main, BigDecimal currentPaymentAmount,ExpectedFortune expectedFortune, String loginUserId, FortuneUpdateRequest fortuneUpdateRequest) {
+    public void splitFortune(Fortune main, BigDecimal currentPaymentAmount, ExpectedFortune expectedFortune, String loginUserId, FortuneUpdateRequest fortuneUpdateRequest) {
        if (currentPaymentAmount == null || currentPaymentAmount.compareTo(BigDecimal.ZERO) <= 0)
            throw new BusinessException("本次发放金额必须大于0");
@@ -341,7 +341,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
                response.setContentType("application/vnd.ms-excel;charset=UTF-8");
                response.setCharacterEncoding("utf-8");
                String encode = URLEncoder.encode("保单发佣.xlsx", "UTF-8");
-                response.setHeader("Content-Disposition", "attachment;filename=" + "fortune_"+System.currentTimeMillis() + ".xlsx");
+                response.setHeader("Content-Disposition", "attachment;filename=" + "fortune_" + System.currentTimeMillis() + ".xlsx");
                // 导出
                try {
@@ -531,12 +531,13 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
    /**
     * 查询单个对象
+     *
     * @param fortuneBizId
     * @return
     */
    @Override
    public Fortune queryOne(String fortuneBizId) {
-        return this.getOne(new LambdaQueryWrapper<Fortune>().eq(Fortune::getFortuneBizId,fortuneBizId));
+        return this.getOne(new LambdaQueryWrapper<Fortune>().eq(Fortune::getFortuneBizId, fortuneBizId));
    }
    @Override
@@ -548,7 +549,6 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
            fortuneStatisticsVO.setTotalPremium(BigDecimal.ZERO);
            fortuneStatisticsVO.setPendingOutAmount(BigDecimal.ZERO);
            fortuneStatisticsVO.setAvailableOutAmount(BigDecimal.ZERO);
-            fortuneStatisticsVO.setDifferenceAmount(BigDecimal.ZERO);
            return fortuneStatisticsVO;
        }
        // 自定义查询
@@ -573,12 +573,6 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
        if (fortuneStatistics.getAvailableOutAmount() == null) {
            fortuneStatistics.setAvailableOutAmount(BigDecimal.ZERO);
        }
-        // 计算差额
-        if (fortuneStatistics.getPendingOutAmount() != null && fortuneStatistics.getAvailableOutAmount() != null) {
-            fortuneStatistics.setDifferenceAmount(fortuneStatistics.getPendingOutAmount().subtract(fortuneStatistics.getAvailableOutAmount()));
-        } else {
-            fortuneStatistics.setDifferenceAmount(BigDecimal.ZERO);
-        }
        return fortuneStatistics;
    }

--- a/yd-csf-service/src/main/resources/mappers/FortuneMapper.xml
+++ b/yd-csf-service/src/main/resources/mappers/FortuneMapper.xml
@@ -15,6 +15,7 @@
            <result property="commissionBizId" column="commission_biz_id" />
            <result property="commissionExpectedBizId" column="commission_expected_biz_id" />
            <result property="policyNo" column="policy_no" />
+            <result property="policyCurrency" column="policy_currency" />
            <result property="fortunePeriod" column="fortune_period" />
            <result property="fortuneTotalPeriod" column="fortune_total_period" />
            <result property="brokerBizId" column="broker_biz_id" />
@@ -51,7 +52,7 @@
    <sql id="Base_Column_List">
        id,fortune_biz_id,expected_fortune_biz_id,reconciliation_year_month,fortune_biz_type,batch_biz_id,
-        commission_biz_id,commission_expected_biz_id,policy_no,fortune_period,fortune_total_period,broker_biz_id,
+        commission_biz_id,commission_expected_biz_id,policy_no,policy_currency,fortune_period,fortune_total_period,broker_biz_id,
        team_biz_id,grade_commission_rate,share_rate,fortune_name,fortune_type,is_part,
        amount,currency,exchange_rate,hkd_amount,current_payment_amount,current_payment_hkd_amount,current_payment_ratio,status,payout_date,actual_payout_date,is_tax,
        tax_amount,net_amount,salary_biz_id,base_rule_biz_id,settlement_biz_id,reconciliation_operator,