新单跟进-修改状态接口

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

@@ -557,11 +557,11 @@ public class ApiPolicyFollowController {
             } catch (BusinessException e) {
             } catch (BusinessException e) {
                 log.info("===== 进入BusinessException catch块 =====");
                 log.info("===== 进入BusinessException catch块 =====");
                 log.info("查询结算币种->保单号:{}，入参request：{}", policyFollow.getPolicyNo(), JSON.toJSONString(announcementRatioListRequest));
                 log.info("查询结算币种->保单号:{}，入参request：{}", policyFollow.getPolicyNo(), JSON.toJSONString(announcementRatioListRequest));
-                return Result.fail("查询产品发佣配置，获取结算币种失败，" + e.getMessage());
+                return Result.fail("未查询到产品发佣配置，查询条件：" + JSON.toJSONString(announcementRatioListRequest));
             } catch (Exception e) {
             } catch (Exception e) {
                 log.info("===== 进入Exception catch块 =====");
                 log.info("===== 进入Exception catch块 =====");
                 log.info("查询结算币种->保单号:{}，入参request：{}", policyFollow.getPolicyNo(), JSON.toJSONString(announcementRatioListRequest));
                 log.info("查询结算币种->保单号:{}，入参request：{}", policyFollow.getPolicyNo(), JSON.toJSONString(announcementRatioListRequest));
-                return Result.fail("查询产品发佣配置，获取结算币种失败，" + e.getMessage());
+                return Result.fail("未查询到产品发佣配置，查询条件：" + JSON.toJSONString(announcementRatioListRequest));
             }
             }
         }
         }
 
 

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

@@ -166,7 +166,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
         } catch (Exception e) {
         } catch (Exception e) {
             log.info("查询结算币种->保单号:{}，入参request：{}", request.getPolicyNo(), JSON.toJSONString(announcementRatioListRequest));
             log.info("查询结算币种->保单号:{}，入参request：{}", request.getPolicyNo(), JSON.toJSONString(announcementRatioListRequest));
 
 
-            throw new BusinessException("查询产品发佣配置，获取结算币种失败，" + e.getMessage());
+            throw new BusinessException("未查询到产品发佣配置，查询条件：" + JSON.toJSONString(announcementRatioListRequest));
         }
         }
 
 
         //遍历保单转介人列表信息 -> 调用基本法算出预计发佣列表
         //遍历保单转介人列表信息 -> 调用基本法算出预计发佣列表
@@ -230,7 +230,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
             );
             );
         } catch (Exception e) {
         } catch (Exception e) {
             log.info("查询结算币种->保单号:{}，入参request：{}", request.getPolicyNo(), JSON.toJSONString(announcementRatioListRequest));
             log.info("查询结算币种->保单号:{}，入参request：{}", request.getPolicyNo(), JSON.toJSONString(announcementRatioListRequest));
-            throw new BusinessException("查询产品发佣配置，获取结算币种失败，" + e.getMessage());
+            throw new BusinessException("未查询到产品发佣配置，查询条件：" + JSON.toJSONString(announcementRatioListRequest));
         }
         }
 
 
         Integer paymentTerm = 0;
         Integer paymentTerm = 0;

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

@@ -2,6 +2,8 @@ package com.yd.csf.service.service.impl;
 
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -631,12 +633,15 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
                 // 匹配规格并获取不匹配的条件
                 // 匹配规格并获取不匹配的条件
                 MatchResult matchResult = matchExpectedSpecies(
                 MatchResult matchResult = matchExpectedSpecies(
                         expectedSpeciesList, paymentTerm, reconciliationCompanyBizId,
                         expectedSpeciesList, paymentTerm, reconciliationCompanyBizId,
-                        policyHolderAge, paymentPremium, effectiveDate);
+                        policyHolderAge, paymentPremium, effectiveDate, policy);
 
 
                 if (matchResult.getMatchedList().isEmpty()) {
                 if (matchResult.getMatchedList().isEmpty()) {
                     String errorMsg = matchResult.getUnmatchedConditions().isEmpty()
                     String errorMsg = matchResult.getUnmatchedConditions().isEmpty()
                             ? "未查询到对应供款年期的佣金规格"
                             ? "未查询到对应供款年期的佣金规格"
                             : "未查询到对应供款年期的佣金规格，不匹配条件：" + String.join("、", matchResult.getUnmatchedConditions());
                             : "未查询到对应供款年期的佣金规格，不匹配条件：" + String.join("、", matchResult.getUnmatchedConditions());
+
+                    log.info("未查询到对应供款年期的佣金规格，当前规格：{}", JSONUtil.toJsonStr(expectedSpeciesList));
+
                     throw new BusinessException(ResultCode.FAIL.getCode(), errorMsg);
                     throw new BusinessException(ResultCode.FAIL.getCode(), errorMsg);
                 }
                 }
 
 
@@ -729,7 +734,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
      */
      */
     private MatchResult matchExpectedSpecies(List<ApiExpectedSpeciesListResponse> expectedSpeciesList,
     private MatchResult matchExpectedSpecies(List<ApiExpectedSpeciesListResponse> expectedSpeciesList,
                                               String paymentTerm, String reconciliationCompanyId,
                                               String paymentTerm, String reconciliationCompanyId,
-                                              Integer policyHolderAge, BigDecimal paymentPremium, Date effectiveDate) {
+                                              Integer policyHolderAge, BigDecimal paymentPremium, Date effectiveDate, Policy policy) {
         List<String> unmatchedConditions = new ArrayList<>();
         List<String> unmatchedConditions = new ArrayList<>();
         List<ApiExpectedSpeciesListResponse> currentList = expectedSpeciesList;
         List<ApiExpectedSpeciesListResponse> currentList = expectedSpeciesList;
 
 
@@ -744,7 +749,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         // 检查对账公司
         // 检查对账公司
         currentList = filterAndCheck(currentList,
         currentList = filterAndCheck(currentList,
                 i -> reconciliationCompanyId.equals(i.getReconciliationCompany()),
                 i -> reconciliationCompanyId.equals(i.getReconciliationCompany()),
-                unmatchedConditions, "对账公司[" + reconciliationCompanyId + "]");
+                unmatchedConditions, "对账公司[" + policy.getReconciliationCompany() + "]");
         if (unmatchedConditions.size() > 0) {
         if (unmatchedConditions.size() > 0) {
             return new MatchResult(Collections.emptyList(), unmatchedConditions);
             return new MatchResult(Collections.emptyList(), unmatchedConditions);
         }
         }
@@ -765,7 +770,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         // 检查生效日期
         // 检查生效日期
         currentList = filterAndCheck(currentList,
         currentList = filterAndCheck(currentList,
                 i -> isEffective(i.getEffectiveStart(), i.getEffectiveEnd(),  effectiveDate),
                 i -> isEffective(i.getEffectiveStart(), i.getEffectiveEnd(),  effectiveDate),
-                unmatchedConditions, "生效日期[" + effectiveDate + "]");
+                unmatchedConditions, "生效日期[" + DateUtil.format(effectiveDate, "yyyy-MM-dd") + "]");
         if (unmatchedConditions.size() > 0) {
         if (unmatchedConditions.size() > 0) {
             return new MatchResult(Collections.emptyList(), unmatchedConditions);
             return new MatchResult(Collections.emptyList(), unmatchedConditions);
         }
         }