Commit 943963b8 by zhangxingmin

push

parent 278680b8
...@@ -1171,6 +1171,7 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia ...@@ -1171,6 +1171,7 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Result editResult(ApiPremiumReconciliationResultEditRequest request) { public Result editResult(ApiPremiumReconciliationResultEditRequest request) {
log.info("设置认定结果-保费对账记录信息前effectiveDate生效日期:{}",request.getEffectiveDate());
// 通过 RequestContextHolder 获取 HttpServletRequest // 通过 RequestContextHolder 获取 HttpServletRequest
HttpServletRequest httpServletRequest = ((ServletRequestAttributes) HttpServletRequest httpServletRequest = ((ServletRequestAttributes)
RequestContextHolder.currentRequestAttributes()).getRequest(); RequestContextHolder.currentRequestAttributes()).getRequest();
...@@ -1212,6 +1213,7 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia ...@@ -1212,6 +1213,7 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia
//遍历保单转介人列表信息 -> 调用基本法算出预计发佣列表 //遍历保单转介人列表信息 -> 调用基本法算出预计发佣列表
// 通过代理对象调用 // 通过代理对象调用
// getSelf().execute(statusRequest,token); // getSelf().execute(statusRequest,token);
log.info("changePolicyFollowStatus前effectiveDate生效日期:{}",statusRequest.getEffectiveDate());
Result<Boolean> result1 = changePolicyFollowStatus(statusRequest,token); Result<Boolean> result1 = changePolicyFollowStatus(statusRequest,token);
if (result1.getCode() != 200) { if (result1.getCode() != 200) {
throw new BusinessException(result1.getMsg()); throw new BusinessException(result1.getMsg());
......
...@@ -611,6 +611,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte ...@@ -611,6 +611,7 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
throw new BusinessException("保單持有人年齡不能为空"); throw new BusinessException("保單持有人年齡不能为空");
} }
Date effectiveDate = policy.getEffectiveDate(); Date effectiveDate = policy.getEffectiveDate();
log.info("getExpectedCommissionByProductlaunchId的effectiveDate生效日期:{}",effectiveDate);
if (effectiveDate == null) { if (effectiveDate == null) {
throw new BusinessException("保单生效日期不能为空"); throw new BusinessException("保单生效日期不能为空");
} }
...@@ -768,9 +769,12 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte ...@@ -768,9 +769,12 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
unmatchedConditions, "保费[" + paymentPremium + "]"); unmatchedConditions, "保费[" + paymentPremium + "]");
// 检查生效日期 // 检查生效日期
log.info("检查生效日期的effectiveDate生效日期:{}",effectiveDate);
currentList = filterAndCheck(currentList, currentList = filterAndCheck(currentList,
i -> isEffective(i.getEffectiveStart(), i.getEffectiveEnd(), effectiveDate), i -> isEffective(i.getEffectiveStart(), i.getEffectiveEnd(), effectiveDate),
unmatchedConditions, "生效日期[" + DateUtil.format(effectiveDate, "yyyy-MM-dd") + "]"); unmatchedConditions, "生效日期[" + DateUtil.format(effectiveDate, "yyyy-MM-dd") + "]");
log.info("检查生效日期的currentList:{}",JSON.toJSONString(currentList));
log.info("检查生效日期的unmatchedConditions:{}",JSON.toJSONString(unmatchedConditions));
if (unmatchedConditions.size() > 0) { if (unmatchedConditions.size() > 0) {
return new MatchResult(Collections.emptyList(), unmatchedConditions); return new MatchResult(Collections.emptyList(), unmatchedConditions);
} }
......
...@@ -553,6 +553,7 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol ...@@ -553,6 +553,7 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
updatePolicyBrokerPolicyNo(policyBizId, policy.getPolicyNo()); updatePolicyBrokerPolicyNo(policyBizId, policy.getPolicyNo());
// 根据保单生成预计入账记录 // 根据保单生成预计入账记录
log.info("根据保单生成预计入账记录前effectiveDate生效日期:{}",policy.getEffectiveDate());
generateExpectedCommission(policyFollow, policy); generateExpectedCommission(policyFollow, policy);
// 更新FNA状态为 "签单完成" // 更新FNA状态为 "签单完成"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment