push

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiPolicyFollowController.java

@@ -23,6 +23,7 @@ import com.yd.csf.api.dto.CommissionExcelDTO;
 import com.yd.csf.api.dto.PolicyExcelDTO;
 import com.yd.csf.api.dto.PolicyFollowDTO;
 import com.yd.csf.api.listener.PolicyDataListener;
+import com.yd.csf.api.service.ApiCommissionConditionService;
 import com.yd.csf.api.service.ApiExpectedFortuneService;
 import com.yd.csf.api.service.ApiPolicyFollowService;
 import com.yd.csf.feign.request.expectedfortune.ApiGenerateExpectedFortuneRequest;
@@ -52,6 +53,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -105,6 +107,9 @@ public class ApiPolicyFollowController {
     @Resource
     private ApiExpectedFortuneAsyncService apiExpectedFortuneAsyncService;
 
+    @Autowired
+    private ApiCommissionConditionService apiCommissionConditionService;
+
 
     @PostMapping("/upload/excel")
     @Transactional(rollbackFor = Exception.class)
@@ -548,16 +553,18 @@ public class ApiPolicyFollowController {
             if (!hasCommissionInfo) {
                 return Result.fail(ResultCode.NULL_ERROR.getCode(), "产品未维护发佣信息");
             }
+
             //查询产品发佣配置，获取结算币种
             ApiAnnouncementCommissionRatioListRequest announcementRatioListRequest = new ApiAnnouncementCommissionRatioListRequest();
             announcementRatioListRequest.setProductLaunchBizId(productLaunchBizId);
             announcementRatioListRequest.setEffectiveDate(changePolicyFollowStatusRequest.getEffectiveDate());
             announcementRatioListRequest.setPaymentTerm(String.valueOf(policyFollow.getIssueNumber()));
             try {
-                feignResultHelper.extractListData(
-                        apiAnnouncementCommissionRatioFeignClient.list(announcementRatioListRequest),
-                        ApiAnnouncementCommissionRatioListResponse.class
-                );
+                apiCommissionConditionService.getCommissionRatioList(policyFollow.getPolicyNo(),changePolicyFollowStatusRequest.getEffectiveDate());
+//                feignResultHelper.extractListData(
+//                        apiAnnouncementCommissionRatioFeignClient.list(announcementRatioListRequest),
+//                        ApiAnnouncementCommissionRatioListResponse.class
+//                );
             } catch (BusinessException e) {
                 log.info("===== 进入BusinessException catch块 =====");
                 log.info("查询结算币种->保单号:{}，入参request：{}", policyFollow.getPolicyNo(), JSON.toJSONString(announcementRatioListRequest));

yd-csf-api/src/main/java/com/yd/csf/api/service/ApiCommissionConditionService.java

@@ -3,8 +3,9 @@ package com.yd.csf.api.service;
 import com.yd.common.result.Result;
 import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioListResponse;
 
+import java.util.Date;
 import java.util.List;
 
 public interface ApiCommissionConditionService {
-    Result<List<ApiAnnouncementCommissionRatioListResponse>> getCommissionRatioList(String policyNo);
+    Result<List<ApiAnnouncementCommissionRatioListResponse>> getCommissionRatioList(String policyNo, Date effectiveDate);
 }

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

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -39,7 +40,7 @@ public class ApiCommissionConditionServiceImpl implements ApiCommissionCondition
      * @return
      */
     @Override
-    public Result<List<ApiAnnouncementCommissionRatioListResponse>> getCommissionRatioList(String policyNo) {
+    public Result<List<ApiAnnouncementCommissionRatioListResponse>> getCommissionRatioList(String policyNo, Date effectiveDate) {
         //根据保单号查询保单跟进表数据
         PolicyFollow policyFollow = policyFollowService.queryOneByPolicyNo(policyNo);
         if (policyFollow == null) {
@@ -64,7 +65,7 @@ public class ApiCommissionConditionServiceImpl implements ApiCommissionCondition
         String guaranteePeriod = policyFollow.getGuaranteePeriod();
         ApiAnnouncementCommissionRatioListRequest ratioListRequest = new ApiAnnouncementCommissionRatioListRequest();
         ratioListRequest.setProductLaunchBizId(policyFollow.getProductLaunchBizId());
-        ratioListRequest.setEffectiveDate(policyFollow.getEffectiveDate());
+        ratioListRequest.setEffectiveDate(effectiveDate !=null ? effectiveDate:policyFollow.getEffectiveDate());
         ratioListRequest.setPaymentTerm(paymentTerm);
         ratioListRequest.setAge(age);
         ratioListRequest.setEachIssuePremium(eachIssuePremium);

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

@@ -226,7 +226,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
 
         Integer paymentTerm = 0;
         List<ApiAnnouncementCommissionRatioListResponse> announcementRatioList = new ArrayList<>();
-        Result<List<ApiAnnouncementCommissionRatioListResponse>> listResult = apiCommissionConditionService.getCommissionRatioList(request.getPolicyNo());
+        Result<List<ApiAnnouncementCommissionRatioListResponse>> listResult = apiCommissionConditionService.getCommissionRatioList(request.getPolicyNo(),null);
         if (listResult != null && !CollectionUtils.isEmpty(listResult.getData())) {
             announcementRatioList = listResult.getData();
             //取 endPeriod 的最大值作为总期数