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

d68a8580 · zhangxingmin · 3c1f1598 · f2b15108 · d68a8580 · d68a8580
Commit d68a8580 authored Jan 09, 2026 by zhangxingmin
11 changed files
--- a/yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiExpectedFortuneServiceImpl.java
+++ b/yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiExpectedFortuneServiceImpl.java
@@ -511,6 +511,9 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService 
            if (Objects.isNull(expectedFortuneDto.getAmount())) {
                throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "预计出账金额不能为空");
            }
+            if (Objects.isNull(expectedFortuneDto.getCurrency())) {
+                throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "预计出账币种不能为空");
+            }
        }
    }

--- a/yd-csf-service/src/main/java/com/yd/csf/service/model/CommissionExpected.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/model/CommissionExpected.java
@@ -48,6 +48,11 @@ public class CommissionExpected implements Serializable {
    private String policyNo;
    /**
+     * 期交保费
+     */
+    private BigDecimal premium;
+    /**
     * 保险公司业务id
     */
    private String insuranceCompanyBizId;

--- 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
@@ -169,6 +169,11 @@ public class Fortune implements Serializable {
    private LocalDate actualPayoutDate;
    /**
+     * 检核人
+     */
+    private String reconciliationOperator;
+    /**
     * 出账数据业务ID
     */
    private String fortuneAccountBizId;

--- a/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionExpectedServiceImpl.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionExpectedServiceImpl.java
@@ -292,6 +292,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
                // 设置关联字段
                commissionExpected.setInsuranceCompanyBizId(policy.getInsuranceCompanyBizId());
                commissionExpected.setProductLaunchBizId(policy.getProductLaunchBizId());
+                commissionExpected.setPremium(policy.getPaymentPremium());
            } else {
                BigDecimal expectedAmount = addDto.getAmount()
                        .multiply(commissionExpected.getDefaultExchangeRate());
@@ -407,6 +408,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
                            .multiply(commissionExpected.getDefaultExchangeRate())
                            .divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP)
            );
+            commissionExpected.setPremium(policy.getPaymentPremium());
        } else {
            commissionExpected.setExpectedAmount(
                    commissionExpectedUpdateRequest.getAmount()

--- 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
@@ -45,7 +45,6 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
 import java.util.function.Function;
-import java.util.function.Supplier;
 import java.util.stream.Collectors;
 /**
@@ -537,15 +536,12 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
        List<ExpectedFortune> expectedFortuneList = iExpectedFortuneService.lambdaQuery()
                .in(ExpectedFortune::getPolicyNo, policyNoSet)
                .list();
-        // 1.2 根据保单号和期数筛选符合的预计发佣记录
+        // 1.2 根据期数筛选符合的预计发佣记录
+        Set<Integer> commissionPeriodSet = commissions.stream().map(Commission::getCommissionPeriod).collect(Collectors.toSet());
        List<ExpectedFortune> filteredExpectedFortuneList1 = new ArrayList<>();
-        for (Commission commission : commissions) {
+        for (ExpectedFortune expectedFortune : expectedFortuneList) {
-            String policyNo = commission.getPolicyNo();
+            if (commissionPeriodSet.contains(expectedFortune.getFortunePeriod())) {
-            Integer commissionPeriod = commission.getCommissionPeriod();
+                filteredExpectedFortuneList1.add(expectedFortune);
-            for (ExpectedFortune expectedFortune : expectedFortuneList) {
-                if (expectedFortune.getPolicyNo().equals(policyNo) && expectedFortune.getFortunePeriod().equals(commissionPeriod)) {
-                    filteredExpectedFortuneList1.add(expectedFortune);
-                }
            }
        }
        if (CollectionUtils.isEmpty(filteredExpectedFortuneList1)) {
@@ -629,7 +625,8 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
        Map<String, Commission> commissionByPolicyPeriod = commissionList.stream()
                .collect(Collectors.toMap(
                        commission -> buildPolicyPeriodKey(commission.getPolicyNo(), commission.getCommissionPeriod()),
-                        Function.identity()
+                        Function.identity(),
+                        (oldValue, newValue) -> newValue  // 遇到重复时使用新值
                ));
        Date now = new Date();
@@ -639,9 +636,13 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
                    BeanUtils.copyProperties(expectedFortune, fortune);
                    fortune.setFortuneBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_FORTUNE.getCode()));
+                    fortune.setId(null);
                    fortune.setFortuneBizType("R");
+                    fortune.setExchangeRate(queryDefaultExchangeRate(fortune.getCurrency()));
                    fortune.setAmount(expectedFortune.getAmount());
+                    fortune.setHkdAmount(expectedFortune.getAmount().multiply(fortune.getExchangeRate()));
                    fortune.setCurrentPaymentAmount(expectedFortune.getAmount());
+                    fortune.setCurrentPaymentHkdAmount(fortune.getCurrentPaymentAmount().multiply(fortune.getExchangeRate()));
                    fortune.setExpectedFortuneBizId(expectedFortune.getExpectedFortuneBizId());
                    fortune.setStatus(FortuneStatusEnum.CAN_SEND.getItemValue());
                    fortune.setIsPart(0);
@@ -665,6 +666,24 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
                .collect(Collectors.toList());
    }
+    private BigDecimal queryDefaultExchangeRate(String currency) {
+        if (StringUtils.isBlank(currency)) {
+            return BigDecimal.ONE;
+        }
+        if ("HKD".equalsIgnoreCase(currency)) {
+            return BigDecimal.valueOf(1);
+        }
+        Result<List<GetDictItemListByDictTypeResponse>> result = apiSysDictFeignClient.getDictItemListByDictType("csf_exchange_rate_hkd");
+        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(result.getData())) {
+            for (GetDictItemListByDictTypeResponse dictItem : result.getData()) {
+                if (StringUtils.equalsIgnoreCase(dictItem.getItemLabel(), currency)) {
+                    return new BigDecimal(dictItem.getItemValue());
+                }
+            }
+        }
+        return BigDecimal.ONE;
+    }
    /**
     * 构建保单号+期次的唯一键
     */
@@ -672,37 +691,6 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
        return (policyNo == null ? "" : policyNo) + "|" + (period == null ? "" : period.toString());
    }
-    private void calculateCurrentFortune(Fortune fortune, List<Fortune> policyPaidFortuneList) {
-        // 根据转介人分组
-        Map<String, List<Fortune>> brokerFortuneMap = policyPaidFortuneList.stream()
-                .collect(Collectors.groupingBy(Fortune::getBrokerBizId));
-        // 当前转介人已发薪资
-        List<Fortune> brokerFortuneList = brokerFortuneMap.getOrDefault(fortune.getBrokerBizId(), new ArrayList<>());
-        // 计算当前佣金条目已发薪资
-        BigDecimal brokerPaidAmount = brokerFortuneList.stream()
-                .filter(item -> StringUtils.equals(item.getFortuneName(), fortune.getFortuneName())
-                        && item.getFortunePeriod().equals(fortune.getFortunePeriod()))
-                .map(Fortune::getNetAmount)
-                .reduce(BigDecimal.ZERO, BigDecimal::add);
-        // 计算当前发佣金额，需要扣减已发薪资
-        fortune.setAmount(fortune.getAmount().subtract(brokerPaidAmount));
-    }
-    private void matchCommission(Fortune fortune, List<Commission> commissionList) {
-        for (Commission commission : commissionList) {
-            if (StringUtils.equals(commission.getPolicyNo(), fortune.getPolicyNo())
-                    && commission.getCommissionPeriod().equals(fortune.getFortunePeriod())
-                    && commission.getCommissionName().equals(fortune.getFortuneName())
-            ) {
-                fortune.setCommissionBizId(commission.getCommissionBizId());
-            } else {
-                fortune.setStatus(FortuneStatusEnum.MATCH_FAIL.getItemValue());
-                fortune.setRemark("未找到当前预计发佣对应的来佣");
-            }
-        }
-    }
    @Override
    public Commission getByCommissionBizId(String commissionBizId) {
        return this.getOne(new QueryWrapper<Commission>().eq("commission_biz_id", commissionBizId));

--- a/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FortuneAccountServiceImpl.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FortuneAccountServiceImpl.java
@@ -67,6 +67,9 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
            return queryWrapper;
        }
        List<String> statusList = fortuneAccountQueryRequest.getStatusList();
+        if (CollectionUtils.isEmpty(statusList)) {
+            statusList = Collections.singletonList("6");
+        }
        List<String> brokerBizIdList = fortuneAccountQueryRequest.getBrokerBizIdList();
        List<String> teamBizIdList = fortuneAccountQueryRequest.getTeamBizIdList();
        queryWrapper.in(CollectionUtils.isNotEmpty(brokerBizIdList), "broker_biz_id", brokerBizIdList);
@@ -124,7 +127,7 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
            fortuneAccount.setAmount(accountExportDTO.getAmount());
            fortuneAccount.setFortuneAccountDate(currentDate);
            // 出账状态默认待出账
-            fortuneAccount.setStatus(FortuneAccountStatusEnum.CANSEND.getItemValue());
+            fortuneAccount.setStatus(FortuneStatusEnum.CHECKED.getItemValue());
            // 转换为List<Map<String, Object>>
            Map<String, BigDecimal> fortuneAmounts = accountExportDTO.getFortuneAmounts();
@@ -263,7 +266,7 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
        /* 2. 更新 FortuneAccount 状态为已出账 ----------------------------------*/
        accountList.forEach(a -> {
-            a.setStatus(FortuneAccountStatusEnum.SENT.getItemValue());
+            a.setStatus(FortuneStatusEnum.SENT.getItemValue());
            a.setFortuneAccountDate(new Date());
            a.setUpdaterId(loginUserId.toString());
            a.setUpdateTime(new Date());

--- 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
@@ -76,9 +76,6 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
        }
        String reconciliationYearMonth = fortuneQueryRequest.getReconciliationYearMonth();
        List<String> statusList = fortuneQueryRequest.getStatusList();
-        if (CollectionUtils.isEmpty(statusList)) {
-            statusList = Collections.singletonList(FortuneStatusEnum.CHECKED.getItemValue());
-        }
        String policyNo = fortuneQueryRequest.getPolicyNo();
        List<String> insuranceCompanyBizIdList = fortuneQueryRequest.getInsuranceCompanyBizIdList();
        List<String> productLaunchBizIdList = fortuneQueryRequest.getProductLaunchBizIdList();
@@ -116,21 +113,16 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
        List<FortuneVO> fortuneVOList = new ArrayList<>();
        Set<String> expectedFortuneBizIdSet = new HashSet<>();
-        Set<String> commissionBizIdSet = new HashSet<>();
        Set<String> policyNoSet = new HashSet<>();
        for (Fortune fortune : fortuneList) {
            FortuneVO fortuneVO = FortuneVO.objToVo(fortune);
            fortuneVOList.add(fortuneVO);
            expectedFortuneBizIdSet.add(fortune.getExpectedFortuneBizId());
-            commissionBizIdSet.add(fortune.getCommissionBizId());
            policyNoSet.add(fortune.getPolicyNo());
        }
-        // 1.关联查询来佣信息
-        List<Commission> commissionList = commissionService.list(new QueryWrapper<Commission>().in("commission_biz_id", commissionBizIdSet));
-        Map<String, Commission> commissionMap = commissionList.stream().collect(Collectors.toMap(Commission::getCommissionBizId, a -> a, (oldValue, newValue) -> newValue));
-        Set<String> commissionExpectedBizIdSet = commissionList.stream().map(Commission::getCommissionExpectedBizId).collect(Collectors.toSet());
+        Set<String> commissionExpectedBizIdSet = fortuneList.stream().map(Fortune::getCommissionExpectedBizId).collect(Collectors.toSet());
-        // 1.1 关联查询来佣预期信息
+        // 1 关联查询来佣预期信息
        List<CommissionExpected> commissionExpectedList = commissionExpectedService.lambdaQuery()
                .in(CommissionExpected::getCommissionExpectedBizId, commissionExpectedBizIdSet)
                .select(CommissionExpected::getCommissionExpectedBizId, CommissionExpected::getPaidAmount, CommissionExpected::getPaidRatio)
@@ -149,15 +141,12 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
        Map<String, ExpectedFortune> expectedFortuneMap = expectedFortuneList.stream().collect(Collectors.toMap(ExpectedFortune::getExpectedFortuneBizId, a -> a, (oldValue, newValue) -> newValue));
        fortuneVOList.forEach(fortuneVO -> {
-            String commissionBizId = fortuneVO.getCommissionBizId();
+            String commissionBizId = fortuneVO.getCommissionExpectedBizId();
-            Commission commission = commissionMap.get(commissionBizId);
+            // 设置来佣金额和比例
-            if (commission != null) {
+            CommissionExpected commissionExpected = commissionExpectedMap.get(commissionBizId);
-                // 设置来佣金额和比例
+            if (commissionExpected != null) {
-                CommissionExpected commissionExpected = commissionExpectedMap.get(commission.getCommissionExpectedBizId());
+                fortuneVO.setCommissionPaidAmount(commissionExpected.getPaidAmount());
-                if (commissionExpected != null) {
+                fortuneVO.setCommissionPaidRatio(commissionExpected.getPaidRatio());
-                    fortuneVO.setCommissionPaidAmount(commissionExpected.getPaidAmount());
-                    fortuneVO.setCommissionPaidRatio(commissionExpected.getPaidRatio());
-                }
            }
            // 设置保单信息
@@ -167,11 +156,6 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
                fortuneVO.setInsuranceCompany(policy.getInsuranceCompany());
                fortuneVO.setProductName(policy.getProductName());
            }
-            // 设置预计出账信息
-            ExpectedFortune expectedFortune = expectedFortuneMap.get(fortuneVO.getExpectedFortuneBizId());
-            if (expectedFortune != null) {
-                FortuneVO.calculateByExpectedFortune(fortuneVO, expectedFortune);
-            }
        });
        fortuneVOPage.setRecords(fortuneVOList);
@@ -225,6 +209,9 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
        AuthUserDto currentLoginUser = SecurityUtil.getCurrentLoginUser();
        String loginUserId = currentLoginUser.getId().toString();
+        // 检核人
+        fortune.setReconciliationOperator(currentLoginUser.getUsername());
        // 如果传入了金额
        if (currentPaymentAmount != null) {
            splitFortune(fortune, currentPaymentAmount, expectedFortune, loginUserId, fortuneUpdateRequest);
@@ -583,8 +570,15 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
        } else {
            fortuneStatistics = fortuneStatisticsList.get(0);
        }
+        if (fortuneStatistics.getAvailableOutAmount() == null) {
+            fortuneStatistics.setAvailableOutAmount(BigDecimal.ZERO);
+        }
        // 计算差额
-        fortuneStatistics.setDifferenceAmount(fortuneStatistics.getPendingOutAmount().subtract(fortuneStatistics.getAvailableOutAmount()));
+        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/java/com/yd/csf/service/vo/ExpectedFortuneExportDTO.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/vo/ExpectedFortuneExportDTO.java
@@ -33,15 +33,15 @@ public class ExpectedFortuneExportDTO {
    @ExcelProperty("保单号")
    private String policyNo;
+    @ExcelProperty("出账状态")
+    private String status;
    @ExcelProperty("转介人名称")
    private String broker;
    @ExcelProperty("团队名称")
    private String team;
-    @ExcelProperty("出账状态")
-    private String status;
    @ExcelProperty("出账币种")
    private String currency;

--- a/yd-csf-service/src/main/java/com/yd/csf/service/vo/FortuneVO.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/vo/FortuneVO.java
@@ -77,6 +77,12 @@ public class FortuneVO implements Serializable {
    private String commissionBizId;
    /**
+     * 来佣预期业务id
+     */
+    @Schema(description = "来佣预期业务id")
+    private String commissionExpectedBizId;
+    /**
     * 已入账来佣金额（HKD）
     */
    @Schema(description = "已入账来佣金额（HKD）")
@@ -155,18 +161,6 @@ public class FortuneVO implements Serializable {
    private String currency;
    /**
-     * 已出账金额
-     */
-    @Schema(description = "已出账金额")
-    private BigDecimal fortunePaidAmount;
-    /**
-     * 待出账金额
-     */
-    @Schema(description = "剩余出账金额")
-    private BigDecimal fortuneUnpaidAmount;
-    /**
     * 本期出账金额
     */
    @Schema(description = "本期出账金额")
@@ -259,6 +253,12 @@ public class FortuneVO implements Serializable {
    private String creatorId;
    /**
+     * 操作人
+     */
+    @Schema(description = "操作人")
+    private String reconciliationOperator;
+    /**
     * 更新人ID
     */
    @Schema(description = "更新人ID")
@@ -292,22 +292,13 @@ public class FortuneVO implements Serializable {
        }
        FortuneVO fortuneVO = new FortuneVO();
        BeanUtils.copyProperties(fortune, fortuneVO);
+        // 待出账比例
+        if (fortuneVO.getCurrentPaymentRatio() != null) {
+            fortuneVO.setFortuneUnpaidRatio(BigDecimal.valueOf(100).subtract(fortuneVO.getCurrentPaymentRatio()));
+        } else {
+            fortuneVO.setFortuneUnpaidRatio(BigDecimal.valueOf(100));
+        }
        return fortuneVO;
    }
-    public static void calculateByExpectedFortune(FortuneVO fortuneVO, ExpectedFortune expectedFortune) {
-        BigDecimal amount = expectedFortune.getAmount();
-        BigDecimal paidAmount = expectedFortune.getPaidAmount();
-        if (amount != null && paidAmount != null) {
-            fortuneVO.setAmount(amount);
-            fortuneVO.setFortunePaidAmount(paidAmount);
-            BigDecimal unpaidAmount = amount.subtract(paidAmount);
-            fortuneVO.setFortuneUnpaidAmount(unpaidAmount);
-            fortuneVO.setFortuneUnpaidRatio(unpaidAmount.divide(amount, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)));
-        }
-    }
 }
--- a/yd-csf-service/src/main/resources/mappers/CommissionExpectedMapper.xml
+++ b/yd-csf-service/src/main/resources/mappers/CommissionExpectedMapper.xml
@@ -10,6 +10,7 @@
            <result property="receivableNo" column="receivable_no" />
            <result property="commissionBizType" column="commission_biz_type" />
            <result property="policyNo" column="policy_no" />
+            <result property="premium" column="premium" />
            <result property="insuranceCompanyBizId" column="insurance_company_biz_id" />
            <result property="productLaunchBizId" column="product_launch_biz_id" />
            <result property="reconciliationCompany" column="reconciliation_company" />
@@ -40,7 +41,7 @@
    <sql id="Base_Column_List">
        id,commission_expected_biz_id,receivable_no,commission_biz_type,
-        policy_no,insurance_company_biz_id,product_launch_biz_id,
+        policy_no,premium,insurance_company_biz_id,product_launch_biz_id,
        reconciliation_company,reconciliation_company_code,reconciliation_company_biz_id,commission_period,
        total_period,commission_name,commission_type,commission_ratio,amount,currency,default_exchange_rate,expected_amount,
        commission_date,status,status_desc,paid_amount,paid_ratio,remark,is_deleted,creator_id,

--- a/yd-csf-service/src/main/resources/mappers/FortuneMapper.xml
+++ b/yd-csf-service/src/main/resources/mappers/FortuneMapper.xml
@@ -33,6 +33,7 @@
            <result property="status" column="status" />
            <result property="payoutDate" column="payout_date" />
            <result property="actualPayoutDate" column="actual_payout_date" />
+            <result property="reconciliationOperator" column="reconciliation_operator" />
            <result property="isTax" column="is_tax" />
            <result property="taxAmount" column="tax_amount" />
            <result property="netAmount" column="net_amount" />
@@ -53,7 +54,7 @@
        commission_biz_id,commission_expected_biz_id,policy_no,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,
+        tax_amount,net_amount,salary_biz_id,base_rule_biz_id,settlement_biz_id,reconciliation_operator,
        calculation_formula,remark,is_deleted,creator_id,updater_id,
        create_time,update_time
    </sql>
@@ -63,13 +64,16 @@
            f.policy_no,
            SUM(CASE WHEN f.is_part = '0' THEN f.hkd_amount ELSE 0 END) AS amount,
            SUM(CASE WHEN f.status = '2' THEN f.current_payment_hkd_amount ELSE 0 END) AS sentAmount,
-            SUM(CASE WHEN f.status = '0' THEN f.current_payment_hkd_amount ELSE 0 END) AS pendingOutAmount,
+            IFNULL(
-            SUM(CASE WHEN f.status = '6' THEN f.current_payment_hkd_amount ELSE 0 END) AS availableOutAmount,
+                (select sum(hkd_amount)
+                from expected_fortune where status = '0' and policy_no = f.policy_no
+                ),0) AS pendingOutAmount,
+            SUM(CASE WHEN f.status in ('6','1') THEN f.current_payment_hkd_amount ELSE 0 END) AS availableOutAmount,
            COUNT(DISTINCT f.policy_no) AS totalPolicyCount,
-            MAX(c.hkd_amount) AS totalInAmount,
+            MAX(ce.expected_amount) AS totalInAmount,
-            MAX(c.premium) AS totalPremium
+            MAX(ce.premium) AS totalPremium
        FROM fortune f
-        LEFT JOIN commission c ON f.commission_biz_id = c.commission_biz_id
+        LEFT JOIN commission_expected ce ON f.commission_expected_biz_id = ce.commission_expected_biz_id
        WHERE 1 = 1
        <if test="fortuneIdList != null and fortuneIdList.size() > 0">
            AND f.id IN