Merge remote-tracking branch 'origin/develop' into develop

yifu-common/yifu-common-ekp/src/main/resources/ekpInsuranceConfig.properties

-insurance.insuranceUrl=http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
+#insurance.insuranceUrl=http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
+insurance.insuranceUrl=http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
 insurance.insuranceFdModelId=181d73279372e5a55438a47d7436ab7e
 insurance.insuranceFdFlowId=18267f206233f29cbd3c5ee425c9408a
 insurance.insuranceDocStatus=20

yifu-common/yifu-common-ekp/src/main/resources/ekpOrderConfig.properties

-ekporder.url=http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
+#ekporder.url=http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
+ekporder.url=http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
 ekporder.orderFdModelId=182f1b7ffe2e96f975564e44e559847d
 ekporder.orderFdFlowId=182f1c098ce991ca96bc927408792beb
 ekporder.replyFdModelId=182f1bb35bb2156fb9a02904bc88dd8a

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java

@@ -277,6 +277,10 @@ public class InsurancesConstants {
 	 * 购买标准不存在
 	 */
 	public static final String BUY_STANDARD_NOT_EXIST = "购买标准不存在";
+	/**
+	 * 购买标准格式错误
+	 */
+	public static final String BUY_STANDARD_PARSE_ERROR = "购买标准格式错误";
 	/**
 	 * 商险购买地省名称不能为空
 	 */

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceCompany.java

@@ -70,4 +70,28 @@ public class TInsuranceCompany extends BaseEntity {
 	@Schema(description = "是否删除 0否/1是")
     private Integer deleteFlag;
 
+	/**
+	 * 商险办理省code
+	 */
+	@Schema(description = "商险办理省code")
+	private Integer insuranceHandleProvince;
+
+	/**
+	 * 商险办理省
+	 */
+	@Schema(description = "商险办理省")
+	private String insuranceHandleProvinceName;
+
+	/**
+	 * 商险办理城市code
+	 */
+	@Schema(description = "商险办理城市code")
+	private Integer insuranceHandleCity;
+
+	/**
+	 * 商险办理城市
+	 */
+	@Schema(description = "商险办理城市")
+	private String insuranceHandleCityName;
+
 }
\ No newline at end of file

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRegisterParam.java

@@ -50,6 +50,12 @@ public class InsuranceRegisterParam implements Serializable {
 	@Schema(description = "保单结束时间")
 	private String policyEnd;
 
+	/**
+	 * 购买标准
+	 */
+	@Schema(description = "购买标准")
+	private String buyStandard;
+
 	/**
 	 * 保单编号
 	 */

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

@@ -234,9 +234,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		insuranceList = baseMapper.getInsuranceList(param);
 		// 购买月数
 		if (CollectionUtils.isNotEmpty(insuranceList)){
-			if(insuranceList.size() > CommonConstants.EXPORT_TWENTY_THOUSAND){
+			/*if(insuranceList.size() > CommonConstants.EXPORT_TWENTY_THOUSAND){
 				return R.failed(InsurancesConstants.EXPORT_TOO_LONG);
-			}
+			}*/
 			insuranceList.stream().forEach(e ->{
 				e.setBuyMonth(LocalDateUtil.betweenMonth(e.getPolicyStart().toString(),e.getPolicyEnd().toString()));
 			});
@@ -782,6 +782,17 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			//购买周期
 			String buyCycle = month + "个月/" + day + "天";
 			insuranceDetailVO.setBuyCycle(buyCycle);
+			//如果是批增需要重新处理购买周期，按生效日期和保单结束时间计算
+			if (CommonConstants.THREE_INT == insuranceDetailVO.getBuyType()){
+				if (Objects.isNull(insuranceDetailVO.getPolicyEffect())){
+					insuranceDetailVO.setBuyCycle(null);
+				}else {
+					day = LocalDateUtil.betweenDay(insuranceDetailVO.getPolicyEffect().toString(),insuranceDetailVO.getPolicyEnd().toString());
+					month = LocalDateUtil.betweenMonth(insuranceDetailVO.getPolicyEffect().toString(),insuranceDetailVO.getPolicyEnd().toString());
+					buyCycle = month + "个月/" + day + "天";
+					insuranceDetailVO.setBuyCycle(buyCycle);
+				}
+			}
 			//派单类型
 			insuranceDetailVO.setDistributeType(insuranceDetailVO.getReduceHandleStatus() == null?insuranceDetailVO.getBuyType():CommonConstants.FIVE_INT);
 			//派单状态
@@ -826,12 +837,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(Arrays.asList(insuranceDetailVO.getDeptNo()));
 			if (null != setInfoByCodes && setInfoByCodes.getCode() == CommonConstants.SUCCESS && Common.isNotNull(setInfoByCodes.getData())) {
 				Map<String, ProjectSetInfoVo> data = setInfoByCodes.getData().getProjectSetInfoVoMap();
+				if(Objects.nonNull(data)){
 					ProjectSetInfoVo jsonObject = data.get(insuranceDetailVO.getDeptNo());
 					if (null != jsonObject){
 						insuranceDetailVO.setInvoiceTitle(Optional.ofNullable(jsonObject.getInvoiceTitleInsurance()).orElse(""));
 					}
 				}
 			}
+		}
 		return insuranceDetailVO;
 	}
 
@@ -886,9 +899,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			insuranceExportList = baseMapper.getInsuranceExportList(param);
 		}
 		if (CollectionUtils.isNotEmpty(insuranceExportList)){
-			if(insuranceExportList.size() > CommonConstants.EXPORT_TWENTY_THOUSAND){
+			/*if(insuranceExportList.size() > CommonConstants.EXPORT_TWENTY_THOUSAND){
 				return R.failed(InsurancesConstants.EXPORT_TOO_LONG);
-			}
+			}*/
 			List<TInsuranceDetail> detailList = new ArrayList<>();
 			//根据项目编码获取项目名称
 			List<String> collect = insuranceExportList.stream().map(e -> e.getDeptNo()).distinct().collect(Collectors.toList());
@@ -1307,12 +1320,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 								//按天
 								//计算起止时间的天数
 								long day = LocalDateUtil.betweenDay(detail.getPolicyStart().toString(), detail.getPolicyEnd().toString());
-								//预估保费 = (购买标准 / 365) * 天数
-								BigDecimal estimatePremium = new BigDecimal(detail.getBuyStandard()).multiply(new BigDecimal(day)).divide(new BigDecimal("365"),CommonConstants.TWO_INT,BigDecimal.ROUND_HALF_UP);
-								detail.setEstimatePremium(estimatePremium);
 								if (detail.getBuyType() == CommonConstants.THREE_INT){
 									detail.setPolicyEffect(LocalDate.now().plusDays(CommonConstants.ONE_INT));
+									day = LocalDateUtil.betweenDay(detail.getPolicyEffect().toString(), detail.getPolicyEnd().toString());
 								}
+								//预估保费 = (购买标准 / 365) * 天数
+								BigDecimal estimatePremium = new BigDecimal(detail.getBuyStandard()).multiply(new BigDecimal(day)).divide(new BigDecimal("365"),CommonConstants.TWO_INT,BigDecimal.ROUND_HALF_UP);
+								detail.setEstimatePremium(estimatePremium);
 								//记录状态均置为「已投保」
 								detail.setBuyHandleStatus(CommonConstants.THREE_INT);
 								detail.setSignFlag(CommonConstants.ONE_INT);
@@ -2233,8 +2247,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				InsuranceBatchParam repeat = distinctList.get(j);
 				if (param.getEmpName().equals(repeat.getEmpName())
 						&& param.getEmpIdcardNo().equals(repeat.getEmpIdcardNo())
+						&& param.getPolicyNo().equals(repeat.getPolicyNo())
 						&& param.getInsuranceCompanyName().equals(repeat.getInsuranceCompanyName())
 						&& param.getInsuranceTypeName().equals(repeat.getInsuranceTypeName())
+						&& param.getBuyStandard().equals(repeat.getBuyStandard())
 						&& i != j){
 					param.setErrorMessage(InsurancesConstants.DUPLICATE_DATA_ERROR);
 					listResult.add(param);
@@ -2461,8 +2477,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			TInsuranceDetail insuranceDetail = this.baseMapper.selectOne(Wrappers.<TInsuranceDetail>query().lambda()
 					.eq(TInsuranceDetail::getEmpName, param.getEmpName())
 					.eq(TInsuranceDetail::getEmpIdcardNo, param.getEmpIdcardNo())
+					.eq(TInsuranceDetail::getPolicyNo,param.getPolicyNo())
 					.eq(TInsuranceDetail::getInsuranceCompanyName, param.getInsuranceCompanyName())
 					.eq(TInsuranceDetail::getInsuranceTypeName, param.getInsuranceTypeName())
+					.eq(TInsuranceDetail::getBuyStandard, param.getBuyStandard())
 					.notIn(TInsuranceDetail::getBuyHandleStatus, setRStatus)
 					.eq(TInsuranceDetail::getDeleteFlag, CommonConstants.ZERO_INT)
 					//有效
@@ -2863,6 +2881,22 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				listResult.add(param);
 				continue;
 			}
+			if (StringUtils.isBlank(param.getBuyStandard())){
+				param.setErrorMessage(InsurancesConstants.BUY_STANDARD_NOT_EXIST);
+				listResult.add(param);
+				continue;
+			}else {
+				if (!ValidityUtil.validateMoney(param.getBuyStandard())){
+					param.setErrorMessage(InsurancesConstants.BUY_STANDARD_PARSE_ERROR);
+					listResult.add(param);
+					continue;
+				}
+				if (!ValidityUtil.validateMoneyMax(param.getBuyStandard())){
+					param.setErrorMessage(InsurancesConstants.INSURANCE_TYPE_STANDARD_MAX_ERROR);
+					listResult.add(param);
+					continue;
+				}
+			}
 			if (StringUtils.isNotBlank(param.getPolicyNo())){
 				if (!ValidityUtil.validate50(param.getPolicyNo())){
 					param.setErrorMessage(InsurancesConstants.POLICY_NO_MORE_THAN_50);
@@ -2884,7 +2918,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					continue;
 				}
 			}
-			//查数据是否存在：姓名 + 身份证号 + 保险公司 + 险种名称 + 保单开始时间 + 保单结束时间
+			//查数据是否存在：姓名 + 身份证号 + 保险公司 + 险种名称 + 保单开始时间 + 保单结束时间 + 购买标准
 			TInsuranceDetail detail = this.baseMapper.selectOne(Wrappers.<TInsuranceDetail>query().lambda()
 					.eq(TInsuranceDetail::getEmpName, param.getEmpName())
 					.eq(TInsuranceDetail::getEmpIdcardNo, param.getEmpIdcardNo())
@@ -2892,6 +2926,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					.eq(TInsuranceDetail::getInsuranceTypeName, param.getInsuranceTypeName())
 					.eq(TInsuranceDetail::getPolicyStart, LocalDateUtil.parseLocalDate(param.getPolicyStart()))
 					.eq(TInsuranceDetail::getPolicyEnd, LocalDateUtil.parseLocalDate(param.getPolicyEnd()))
+					.eq(TInsuranceDetail::getBuyStandard,param.getBuyStandard())
 					.eq(TInsuranceDetail::getDeleteFlag, CommonConstants.ZERO_INT)
 					.orderByDesc(TInsuranceDetail::getUpdateTime)
 					.last(CommonConstants.LAST_ONE_SQL)
@@ -3305,9 +3340,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		List<InsuredListVo> insuredList;
 		insuredList = this.baseMapper.getInsuredList(param);
 		if (CollectionUtils.isNotEmpty(insuredList)){
-			if(insuredList.size() > CommonConstants.EXPORT_TWENTY_THOUSAND){
-				return R.failed(InsurancesConstants.IMPORT_TOO_LONG);
-			}
+			/*if(insuredList.size() > CommonConstants.EXPORT_TWENTY_THOUSAND){
+				return R.failed(InsurancesConstants.EXPORT_TOO_LONG);
+			}*/
 			//根据项目编码获取项目名称
 			List<String> collect = insuredList.stream().map(InsuredListVo::getDeptNo).distinct().collect(Collectors.toList());
 			try{
@@ -3385,9 +3420,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		}
 		List<InsuranceRefundListVo> insuranceRefundList = this.baseMapper.getInsuranceRefundList(param);
 		if (CollectionUtils.isNotEmpty(insuranceRefundList)){
-			if(insuranceRefundList.size() > CommonConstants.EXPORT_TWENTY_THOUSAND){
+			/*if(insuranceRefundList.size() > CommonConstants.EXPORT_TWENTY_THOUSAND){
 				return R.failed(InsurancesConstants.EXPORT_TOO_LONG);
-			}
+			}*/
 			//根据项目编码获取项目名称
 			List<String> collect = insuranceRefundList.stream().map(InsuranceRefundListVo::getDeptNo).distinct().collect(Collectors.toList());
 			R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(collect);
@@ -3472,9 +3507,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			refundExportList = baseMapper.getRefundExportList(param);
 		}
 		if (CollectionUtils.isNotEmpty(refundExportList)){
-			if(refundExportList.size() > CommonConstants.EXPORT_TWENTY_THOUSAND){
+			/*if(refundExportList.size() > CommonConstants.EXPORT_TWENTY_THOUSAND){
 				return R.failed(InsurancesConstants.EXPORT_TOO_LONG);
-			}
+			}*/
 			List<TInsuranceDetail> detailList = new ArrayList<>();
 			List<TInsuranceRefund> refundList = new ArrayList<>();
 			//根据项目编码获取项目名称

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceCompanyMapper.xml

@@ -15,12 +15,17 @@
             <result property="updateBy" column="UPDATE_BY" jdbcType="VARCHAR"/>
             <result property="updateTime" column="UPDATE_TIME" jdbcType="TIMESTAMP"/>
             <result property="deleteFlag" column="DELETE_FLAG" jdbcType="TINYINT"/>
+			<result property="insuranceHandleProvince" column="INSURANCE_HANDLE_PROVINCE" jdbcType="TINYINT"/>
+			<result property="insuranceHandleProvinceName" column="INSURANCE_HANDLE_PROVINCE_NAME" jdbcType="VARCHAR"/>
+			<result property="insuranceHandleCity" column="INSURANCE_HANDLE_CITY" jdbcType="TINYINT"/>
+			<result property="insuranceHandleCityName" column="INSURANCE_HANDLE_CITY_NAME" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         ID,COMPANY_NAME,COMPANY_ADDRESS,
         COMPANY_DOCKING,CREATE_BY,CREATE_NAME,
         CREATE_TIME,UPDATE_BY,UPDATE_TIME,
-        DELETE_FLAG
+        DELETE_FLAG,
+		INSURANCE_HANDLE_PROVINCE,INSURANCE_HANDLE_PROVINCE_NAME,INSURANCE_HANDLE_CITY,INSURANCE_HANDLE_CITY_NAME
     </sql>
 </mapper>