新单跟进v2

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiExpectedFortuneServiceImpl.java

@@ -11,10 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yd.auth.core.dto.AuthUserDto;
 import com.yd.auth.core.dto.AuthUserDto;
 import com.yd.auth.core.utils.SecurityUtil;
 import com.yd.auth.core.utils.SecurityUtil;
 import com.yd.common.constant.RedisConstants;
 import com.yd.common.constant.RedisConstants;
-import com.yd.common.enums.CommonEnum;
-import com.yd.common.enums.ProjectEnum;
-import com.yd.common.enums.ResultCode;
-import com.yd.common.enums.TenantEnum;
+import com.yd.common.enums.*;
 import com.yd.common.exception.BusinessException;
 import com.yd.common.exception.BusinessException;
 import com.yd.common.result.Result;
 import com.yd.common.result.Result;
 import com.yd.common.utils.RandomStringGenerator;
 import com.yd.common.utils.RandomStringGenerator;
@@ -606,6 +603,8 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
                 fortune.setPolicyNo(fortuneDto.getPolicyNo());
                 fortune.setPolicyNo(fortuneDto.getPolicyNo());
                 //预计发佣日期
                 //预计发佣日期
                 fortune.setPayoutDate(fortuneDto.getPayoutDate());
                 fortune.setPayoutDate(fortuneDto.getPayoutDate());
+                //默认结算汇率
+                fortune.setDefaultExchangeRate(queryDefaultExchangeRate(fortune.getCurrency()));
 
 
                 // 标准发佣金额 -> 计算值
                 // 标准发佣金额 -> 计算值
                 BigDecimal standardAmount = algorithmResDto.getCalculatedValue();
                 BigDecimal standardAmount = algorithmResDto.getCalculatedValue();
@@ -624,6 +623,8 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
                     // 计算实际预计发佣金额 = 标准发佣金额 × decimalRatio
                     // 计算实际预计发佣金额 = 标准发佣金额 × decimalRatio
                     BigDecimal actualAmount = standardAmount.multiply(decimalRatio);
                     BigDecimal actualAmount = standardAmount.multiply(decimalRatio);
                     fortune.setAmount(actualAmount);
                     fortune.setAmount(actualAmount);
+                    // 计算港币金额
+                    fortune.setHkdAmount(actualAmount.multiply(fortune.getDefaultExchangeRate()));
 
 
                 } catch (NumberFormatException e) {
                 } catch (NumberFormatException e) {
                     // 如果比例不是有效的数字，使用标准金额
                     // 如果比例不是有效的数字，使用标准金额
@@ -708,6 +709,14 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
         if ("HKD".equalsIgnoreCase(currency)) {
         if ("HKD".equalsIgnoreCase(currency)) {
             return BigDecimal.valueOf(1);
             return BigDecimal.valueOf(1);
         }
         }
+        //查询redis缓存的字典列表信息
+        List<GetDictItemListByDictTypeResponse> dictTypeResponses = redisUtil.getCacheObject(RedisConstants.DICT_LIST);
+        String defaultExchangeRaye = GetDictItemListByDictTypeResponse.getItemLabel(dictTypeResponses,
+                "csf_exchange_rate_hkd", currency);
+        if (ObjectUtils.isNotEmpty(defaultExchangeRaye)) {
+            return new BigDecimal(defaultExchangeRaye);
+        }
+
         Result<List<GetDictItemListByDictTypeResponse>> result = apiSysDictFeignClient.getDictItemListByDictType("csf_exchange_rate_hkd");
         Result<List<GetDictItemListByDictTypeResponse>> result = apiSysDictFeignClient.getDictItemListByDictType("csf_exchange_rate_hkd");
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(result.getData())) {
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(result.getData())) {
             for (GetDictItemListByDictTypeResponse dictItem : result.getData()) {
             for (GetDictItemListByDictTypeResponse dictItem : result.getData()) {

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

@@ -35,6 +35,20 @@ public class PolicyFollowVO implements Serializable {
     private String policyNo;
     private String policyNo;
 
 
     /**
     /**
+     * 核保日期
+     */
+    @Schema(description = "核保日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date underwritingDate;
+
+    /**
+     * 生效日期
+     */
+    @Schema(description = "生效日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date effectiveDate;
+
+    /**
      * 新单跟进状态
      * 新单跟进状态
      */
      */
     @Schema(description = "新单跟进状态")
     @Schema(description = "新单跟进状态")