入账检核-对账公司数量，出账检核-已出账金额、剩余出账金额

yd-csf-service/src/main/java/com/yd/csf/service/enums/CurrencyEnum.java

@@ -17,8 +17,8 @@ import org.apache.commons.lang3.ObjectUtils;
 public enum CurrencyEnum {
 public enum CurrencyEnum {
     // 货币枚举
     // 货币枚举
     USD("美元", "USD"),
     USD("美元", "USD"),
-    CNY("人民幣", "CNY"),
-    HKD("港幣", "HKD"),
+    CNY("人民币", "CNY"),
+    HKD("港币", "HKD"),
     AUD("澳元", "AUD"),
     AUD("澳元", "AUD"),
     JPY("日元", "JPY"),
     JPY("日元", "JPY"),
     CAD("加元", "CAD"),
     CAD("加元", "CAD"),
@@ -65,4 +65,13 @@ public enum CurrencyEnum {
     public String getItemValue() {
     public String getItemValue() {
         return itemValue;
         return itemValue;
     }
     }
+
+    public static String toLabel(String itemValue) {
+        for (CurrencyEnum anEnum : CurrencyEnum.values()) {
+            if (anEnum.itemValue.equalsIgnoreCase(itemValue)) {
+                return anEnum.getItemLabel();
+            }
+        }
+        return "";
+    }
 }
 }

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

 package com.yd.csf.service.vo;
 package com.yd.csf.service.vo;
 
 
+import cn.hutool.core.util.NumberUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yd.csf.service.enums.CurrencyEnum;
 import com.yd.csf.service.model.ExpectedFortune;
 import com.yd.csf.service.model.ExpectedFortune;
 import com.yd.csf.service.model.Fortune;
 import com.yd.csf.service.model.Fortune;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -334,6 +336,11 @@ public class FortuneVO implements Serializable {
         } else {
         } else {
             fortuneVO.setFortuneUnpaidRatio(BigDecimal.valueOf(100));
             fortuneVO.setFortuneUnpaidRatio(BigDecimal.valueOf(100));
         }
         }
+        fortuneVO.setFortunePaidAmount(fortune.getCurrentPaymentHkdAmount());
+        fortuneVO.setFortuneUnpaidAmount(NumberUtil.sub(fortune.getHkdAmount(), fortune.getCurrentPaymentHkdAmount()));
+
+        fortuneVO.setCurrency(CurrencyEnum.toLabel(fortune.getCurrency()));
+        fortuneVO.setPolicyCurrency((CurrencyEnum.toLabel(fortune.getPolicyCurrency())));
 
 
         return fortuneVO;
         return fortuneVO;
     }
     }

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

@@ -107,7 +107,7 @@
         ) as expectePaidAmount,
         ) as expectePaidAmount,
         COUNT(DISTINCT c.policy_no) as totalPolicyCount,
         COUNT(DISTINCT c.policy_no) as totalPolicyCount,
         COALESCE(p.total_payment_premium * e.default_exchange_rate, 0) AS totalPremium,
         COALESCE(p.total_payment_premium * e.default_exchange_rate, 0) AS totalPremium,
-        COUNT(DISTINCT c.reconciliation_company) as reconciliationCompanyCount,
+        COUNT(DISTINCT c.reconciliation_company_code) as reconciliationCompanyCount,
         COUNT(DISTINCT c.id) as totalCompareCommissionCount,
         COUNT(DISTINCT c.id) as totalCompareCommissionCount,
         SUM(CASE WHEN c.status = '1' THEN 1 ELSE 0 END) as successCompareCommissionCount,
         SUM(CASE WHEN c.status = '1' THEN 1 ELSE 0 END) as successCompareCommissionCount,
         SUM(CASE WHEN c.status = '2' THEN 1 ELSE 0 END) as failedCompareCommissionCount
         SUM(CASE WHEN c.status = '2' THEN 1 ELSE 0 END) as failedCompareCommissionCount