前端对接问题修复100

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 String policyNo;
 
 
     /**
     /**
+     * 期交保费
+     */
+    private BigDecimal premium;
+
+    /**
      * 保险公司业务id
      * 保险公司业务id
      */
      */
     private String insuranceCompanyBizId;
     private String insuranceCompanyBizId;

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.setInsuranceCompanyBizId(policy.getInsuranceCompanyBizId());
                 commissionExpected.setProductLaunchBizId(policy.getProductLaunchBizId());
                 commissionExpected.setProductLaunchBizId(policy.getProductLaunchBizId());
+                commissionExpected.setPremium(policy.getPaymentPremium());
             } else {
             } else {
                 BigDecimal expectedAmount = addDto.getAmount()
                 BigDecimal expectedAmount = addDto.getAmount()
                         .multiply(commissionExpected.getDefaultExchangeRate());
                         .multiply(commissionExpected.getDefaultExchangeRate());
@@ -407,6 +408,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
                             .multiply(commissionExpected.getDefaultExchangeRate())
                             .multiply(commissionExpected.getDefaultExchangeRate())
                             .divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP)
                             .divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP)
             );
             );
+            commissionExpected.setPremium(policy.getPaymentPremium());
         } else {
         } else {
             commissionExpected.setExpectedAmount(
             commissionExpected.setExpectedAmount(
                     commissionExpectedUpdateRequest.getAmount()
                     commissionExpectedUpdateRequest.getAmount()

yd-csf-service/src/main/resources/mappers/CommissionExpectedMapper.xml

@@ -10,6 +10,7 @@
             <result property="receivableNo" column="receivable_no" />
             <result property="receivableNo" column="receivable_no" />
             <result property="commissionBizType" column="commission_biz_type" />
             <result property="commissionBizType" column="commission_biz_type" />
             <result property="policyNo" column="policy_no" />
             <result property="policyNo" column="policy_no" />
+            <result property="premium" column="premium" />
             <result property="insuranceCompanyBizId" column="insurance_company_biz_id" />
             <result property="insuranceCompanyBizId" column="insurance_company_biz_id" />
             <result property="productLaunchBizId" column="product_launch_biz_id" />
             <result property="productLaunchBizId" column="product_launch_biz_id" />
             <result property="reconciliationCompany" column="reconciliation_company" />
             <result property="reconciliationCompany" column="reconciliation_company" />
@@ -40,7 +41,7 @@
 
 
     <sql id="Base_Column_List">
     <sql id="Base_Column_List">
         id,commission_expected_biz_id,receivable_no,commission_biz_type,
         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,
         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,
         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,
         commission_date,status,status_desc,paid_amount,paid_ratio,remark,is_deleted,creator_id,

yd-csf-service/src/main/resources/mappers/FortuneMapper.xml

@@ -66,7 +66,7 @@
             SUM(CASE WHEN f.status = '0' THEN f.current_payment_hkd_amount ELSE 0 END) AS pendingOutAmount,
             SUM(CASE WHEN f.status = '0' THEN f.current_payment_hkd_amount ELSE 0 END) AS pendingOutAmount,
             SUM(CASE WHEN f.status = '6' THEN f.current_payment_hkd_amount ELSE 0 END) AS availableOutAmount,
             SUM(CASE WHEN f.status = '6' THEN f.current_payment_hkd_amount ELSE 0 END) AS availableOutAmount,
             COUNT(DISTINCT f.policy_no) AS totalPolicyCount,
             COUNT(DISTINCT f.policy_no) AS totalPolicyCount,
-            MAX(ce.hkd_amount) AS totalInAmount,
+            MAX(ce.expected_amount) AS totalInAmount,
             MAX(ce.premium) AS totalPremium
             MAX(ce.premium) AS totalPremium
         FROM fortune f
         FROM fortune f
         LEFT JOIN commission_expected ce ON f.commission_expected_biz_id = ce.commission_expected_biz_id
         LEFT JOIN commission_expected ce ON f.commission_expected_biz_id = ce.commission_expected_biz_id