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

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

@@ -9,6 +9,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yd.base.feign.client.exchangerate.ApiExchangeRateFeignClient;
 import com.yd.common.enums.CommonEnum;
 import com.yd.common.enums.ResultCode;
 import com.yd.common.exception.BusinessException;
@@ -81,8 +82,8 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
     private TransactionTemplate transactionTemplate;
     @Resource
     private ReceivableService receivableService;
-    @Autowired
-    private ApiSysDictFeignClient apiSysDictFeignClient;
+    @Resource
+    private ApiExchangeRateFeignClient apiExchangeRateFeignClient;
     @Resource
     private ApiInsuranceReconciliationCompanyFeignClient apiInsuranceReconciliationCompanyFeignClient;
 
@@ -677,11 +678,11 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
                     fortune.setFortuneBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_FORTUNE.getCode()));
                     fortune.setId(null);
                     fortune.setFortuneBizType("R");
-                    fortune.setExchangeRate(queryDefaultExchangeRate(fortune.getCurrency()));
+                    fortune.setExchangeRate(expectedFortune.getDefaultExchangeRate());
                     fortune.setAmount(expectedFortune.getAmount());
-                    fortune.setHkdAmount(expectedFortune.getAmount().multiply(fortune.getExchangeRate()));
+                    fortune.setHkdAmount(expectedFortune.getHkdAmount());
                     fortune.setCurrentPaymentAmount(expectedFortune.getAmount());
-                    fortune.setCurrentPaymentHkdAmount(fortune.getCurrentPaymentAmount().multiply(fortune.getExchangeRate()));
+                    fortune.setCurrentPaymentHkdAmount(expectedFortune.getHkdAmount());
                     fortune.setExpectedFortuneBizId(expectedFortune.getExpectedFortuneBizId());
                     fortune.setStatus(FortuneStatusEnum.CAN_SEND.getItemValue());
                     fortune.setIsPart(0);
@@ -705,22 +706,22 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
                 .collect(Collectors.toList());
     }
 
-    private BigDecimal queryDefaultExchangeRate(String currency) {
-        if (StringUtils.isBlank(currency)) {
+    /**
+     * 保单币种对预计来佣的结算币种的默认汇率
+     * @param policyCurrency 保单币种
+     * @param currency 预计来佣的结算币种
+     * @return 汇率
+     */
+    private BigDecimal queryExchangeRateByFeign(String policyCurrency, String currency) {
+        if (policyCurrency.equalsIgnoreCase(currency)) {
             return BigDecimal.ONE;
         }
-        if ("HKD".equalsIgnoreCase(currency)) {
-            return BigDecimal.valueOf(1);
-        }
-        Result<List<GetDictItemListByDictTypeResponse>> result = apiSysDictFeignClient.getDictItemListByDictType("csf_exchange_rate_hkd");
-        if (CollectionUtils.isNotEmpty(result.getData())) {
-            for (GetDictItemListByDictTypeResponse dictItem : result.getData()) {
-                if (StringUtils.equalsIgnoreCase(dictItem.getItemLabel(), currency)) {
-                    return new BigDecimal(dictItem.getItemValue());
+        // 调用Feign客户端查询汇率
+        Result<BigDecimal> result = apiExchangeRateFeignClient.getExchangeRate(policyCurrency, currency, "");
+        if (result != null && result.getData() != null) {
+            return result.getData();
         }
-            }
-        }
-        return BigDecimal.ONE;
+        return null;
     }
 
     /**

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

@@ -106,7 +106,7 @@
             ), 0
         ) as expectePaidAmount,
         COUNT(DISTINCT c.policy_no) as totalPolicyCount,
-        COALESCE(SUM(CAST(c.premium AS DECIMAL(15,2)) * p.payment_term), 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.id) as totalCompareCommissionCount,
         SUM(CASE WHEN c.status = '1' THEN 1 ELSE 0 END) as successCompareCommissionCount,