Merge branch 'feature-licancan' into 'feature/insurance-1.3.0'

Feature licancan

See merge request !308

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java

@@ -2065,10 +2065,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				if (Optional.ofNullable(detail).isPresent()){
 					//当两次发票号不一致时才更新
 					if (!success.getInvoiceNo().equals(detail.getInvoiceNo())){
-						//设置发票号
-						detail.setInvoiceNo(success.getInvoiceNo());
-						detailList.add(detail);
-
 						//只有当结算id存在的时候修改数据才会推给ekp
 						if (StringUtils.isNotBlank(detail.getDefaultSettleId())){
 							try {
@@ -2086,6 +2082,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 								log.error("pushEkp error registeredInvoiceNo:",e.getMessage());
 							}
 						}
+
+						//设置发票号
+						detail.setInvoiceNo(success.getInvoiceNo());
+						detailList.add(detail);
 					}
 				}
 			}
@@ -2197,18 +2197,21 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							//推送修改信息
 							StringBuilder sb = new StringBuilder();
 							sb.append("操作人:" + user.getNickname() + ";操作时间:" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-							if (!oldDetail.getPolicyStart().toString().equals(success.getPolicyStart())) {
-								sb.append(";变更前保单开始时间:" + oldDetail.getPolicyStart() + ";变更后保单开始时间:" + success.getPolicyStart());
+							if (!oldDetail.getPolicyStart().toString().equals(success.getPolicyStartNew())) {
+								sb.append(";变更前保单开始时间:" + oldDetail.getPolicyStart() + ";变更后保单开始时间:" + success.getPolicyStartNew());
 							}
-							if (!oldDetail.getPolicyEnd().toString().equals(success.getPolicyEnd())) {
-								sb.append(";变更前保单结束时间:" + oldDetail.getPolicyEnd() + ";变更后保单结束时间:" + success.getPolicyEnd());
+							if (!oldDetail.getPolicyEnd().toString().equals(success.getPolicyEndNew())) {
+								sb.append(";变更前保单结束时间:" + oldDetail.getPolicyEnd() + ";变更后保单结束时间:" + success.getPolicyEndNew());
 							}
 							if (!oldDetail.getBuyType().equals(success.getBuyType())) {
 								sb.append(";变更前投保类型:" + getBuyType(oldDetail.getBuyType()) + ";变更后投保类型:" + getBuyType(success.getBuyType()));
 							}
+							if (StringUtils.isNotBlank(success.getReason())){
+								sb.append(";变更原因:" + success.getReason());
+							}
 							EkpUpdateParam ekpUpdateParam = new EkpUpdateParam();
-							ekpUpdateParam.setFd_3b5bf02d3b8fc4(success.getPolicyStart());
-							ekpUpdateParam.setFd_3b5bf02e1d47cc(success.getPolicyEnd());
+							ekpUpdateParam.setFd_3b5bf02d3b8fc4(success.getPolicyStartNew());
+							ekpUpdateParam.setFd_3b5bf02e1d47cc(success.getPolicyEndNew());
 							ekpUpdateParam.setFd_3b5bf02fa14596(getBuyType(success.getBuyType()));
 							ekpUpdateParam.setFd_3b5bf031b52314(detail.getBuyStandard());
 							ekpUpdateParam.setFd_3b5bf032d7a822(detail.getId() + "_" + detail.getDefaultSettleId());
@@ -2313,6 +2316,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				if (!old.getBuyType().equals(param.getBuyType())) {
 					sb.append(";变更前投保类型:" + getBuyType(old.getBuyType()) + ";变更后投保类型:" + getBuyType(param.getBuyType()));
 				}
+				if (StringUtils.isNotBlank(param.getReason())){
+					sb.append(";变更原因:" + param.getReason());
+				}
 				EkpUpdateParam ekpUpdateParam = new EkpUpdateParam();
 				ekpUpdateParam.setFd_3b5bf02d3b8fc4(param.getPolicyStart());
 				ekpUpdateParam.setFd_3b5bf02e1d47cc(param.getPolicyEnd());