Merge branch 'feature-zhaji' into 'develop'

Feature zhaji

See merge request fangxinjiang/yifu!245

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

@@ -1076,7 +1076,25 @@ public class InsurancesConstants {
 	 */
 	public static final String IMPORT_TOO_LONG = "一次性导入不可超过20000条，请分批导入";
 
+	/**
+	 * 结算类型不一致
+	 */
+	public static final String SETTLE_TYPE_ATYPISM = "结算类型不一致";
+
+	/**
+	 * 预估已推送
+	 */
+	public static final String ESTIMATE_IS_PUSH = "预估已推送";
 
+	/**
+	 * 实缴已推送，请分批导入
+	 */
+	public static final String ACTUAL_IS_PUSH = "实缴已推送";
+
+	/**
+	 * 结算id不一致，请分批导入
+	 */
+	public static final String SETTLE_ID_ATYPISM = "结算id不一致";
 
 
 

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

@@ -161,6 +161,12 @@ public class TInsuranceEkp implements Serializable {
 	@Schema(description = "推送类型（1推送预估费用,2推送实缴费用,3变更结算信息,4推送作废信息,5推送预估红冲信息,6推送实缴红冲信息）")
 	private Integer pushType;
 
+	/**
+	 * 不重发原因
+	 */
+	private String notResendMessage;
+
+
     private static final long serialVersionUID = 1L;
 
 }
\ No newline at end of file

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

@@ -65,15 +65,10 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
 				String defaultSettleId = byId.getDefaultSettleId();
 				String s = null;
 				String settleType = tInsuranceEkp.getSettleType();
-				if(InsurancesConstants.ACTUAL_SETTLE_BILL.equals(settleType)){
-					settleType = CommonConstants.ONE_STRING;
-				}
-				if(InsurancesConstants.ESTIMATE_SETTLE_BILL.equals(settleType)){
-					settleType = CommonConstants.ZERO_STRING;
-				}
 				Integer pushType = tInsuranceEkp.getPushType();
 				//商险结算信息
 				TInsuranceSettle insuranceSettle = tInsuranceSettleService.getById(tInsuranceEkp.getDefaultSettleId());
+				//结算id是否一致
 				boolean settleIdEquals = tInsuranceEkp.getDefaultSettleId().equals(defaultSettleId);
 				//预估是否已发送
 				boolean estimatePush = Common.isEmpty(insuranceSettle) || insuranceSettle.getIsEstimatePush() == CommonConstants.ZERO_INT;
@@ -89,6 +84,8 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
 				detailUpdate.eq(TInsuranceDetail :: getId,tInsuranceEkp.getDetailId());
 				LambdaUpdateWrapper<TInsuranceEkp> ekpUpdate = new LambdaUpdateWrapper<>();
 				ekpUpdate.eq(TInsuranceEkp :: getId,tInsuranceEkp.getId());
+				//ekp结算信息
+				SettleVo settleVo = tInsuranceDetailService.getInsuranceDetailSettleStatus(tInsuranceEkp.getDetailId(), tInsuranceEkp.getDefaultSettleId());
 				if(settleType.equals(CommonConstants.ZERO_STRING)){
 					ekpParam.setEstimateStatus(EkpConstants.HAVE);
 				}else{
@@ -96,12 +93,26 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
 				}
 				//预估新增重发
 				if(CommonConstants.ONE_INT == pushType){
-					//如果结算类型不一致，结算类型不为空且已预估发送，结算id不一致
-					if(!settleTypeEquals || !estimatePush || !settleIdEquals){
+					//如果结算类型不一致，预估已推送，结算id不一致，结算信息不为空
+					if(!settleTypeEquals  || !settleIdEquals || !estimatePush){
+						if(!settleTypeEquals){
+							ekpUpdate.set(TInsuranceEkp :: getNotResendMessage,CommonConstants.TWO_INT);
+						}
+						if(!settleIdEquals){
+							ekpUpdate.set(TInsuranceEkp :: getNotResendMessage,CommonConstants.TWO_INT);
+						}
+						if(!estimatePush){
+							ekpUpdate.set(TInsuranceEkp :: getNotResendMessage,CommonConstants.TWO_INT);
+						}
 						ekpUpdate.set(TInsuranceEkp :: getResendFlag,CommonConstants.TWO_INT);
 						update(ekpUpdate);
+						if(!Common.isEmpty(settleVo)){
+							settleUpdate.set(TInsuranceSettle :: getEstimatePushTime,LocalDateTime.now())
+									.set(TInsuranceSettle ::getIsEstimatePush,CommonConstants.ONE_INT);
+							tInsuranceSettleService.update(settleUpdate);
+						}
 						continue;
-					}else{
+					} else{
 						ekpParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
 						ekpParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
 						s = ekpInsuranceUtil.sendToEkp(ekpParam);
@@ -109,7 +120,8 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
 							settleUpdate.set(TInsuranceSettle :: getEstimatePushTime,LocalDateTime.now())
 									.set(TInsuranceSettle ::getIsEstimatePush,CommonConstants.ONE_INT);
 							tInsuranceSettleService.update(settleUpdate);
-							ekpUpdate.set(TInsuranceEkp :: getResendFlag ,CommonConstants.ONE_INT);
+							ekpUpdate.set(TInsuranceEkp :: getResendFlag ,CommonConstants.ONE_INT)
+									.set(TInsuranceEkp :: getPushTime ,LocalDateTime.now());
 							update(ekpUpdate);
 						}else{
 							break;
@@ -118,7 +130,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
 				}
 				//实缴新增重发
 				if(CommonConstants.TWO_INT == pushType){
-					//如果结算类型不一致，结算类型不为空且已发送，结算id不一致
+					//如果结算类型不一致，实缴已推送，结算id不一致，则不再推送
 					if(!settleTypeEquals || !actualPush || !settleIdEquals){
 						ekpUpdate.set(TInsuranceEkp :: getResendFlag,CommonConstants.TWO_INT);
 						update(ekpUpdate);
@@ -131,15 +143,14 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
 							settleUpdate.set(TInsuranceSettle :: getActualPushTime,LocalDateTime.now())
 									.set(TInsuranceSettle ::getIsActualPush,CommonConstants.ONE_INT);
 							tInsuranceSettleService.update(settleUpdate);
-							ekpUpdate.set(TInsuranceEkp :: getResendFlag ,CommonConstants.ONE_INT);
+							ekpUpdate.set(TInsuranceEkp :: getResendFlag ,CommonConstants.ONE_INT)
+									.set(TInsuranceEkp :: getPushTime ,LocalDateTime.now());
 							update(ekpUpdate);
 						}else{
 							break;
 						}
 					}
 				}
-				//ekp结算信息
-				SettleVo settleVo = tInsuranceDetailService.getInsuranceDetailSettleStatus(tInsuranceEkp.getDetailId(), tInsuranceEkp.getDefaultSettleId());
 				//实缴结算状态
 				String actualStatus = null;
 				//预缴结算状态
@@ -153,7 +164,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
 				//变更结算信息
 				if(CommonConstants.THREE_INT == pushType){
 					//如果结算类型不一致，结算类型不为空且已发送，结算id不一致
-					if(!settleTypeEquals  || !settleIdEquals || !eStatus || !aStatus){
+					if(!settleIdEquals || !eStatus || !aStatus){
 						ekpUpdate.set(TInsuranceEkp :: getResendFlag,CommonConstants.TWO_INT);
 						update(ekpUpdate);
 						continue;
@@ -161,7 +172,8 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
 						ekpParam.setInteractiveType(InsurancesConstants.UPDATE_SETTLE_BILL);
 						s = ekpInsuranceUtil.sendToEkp(ekpParam);
 						if(StringUtils.isNotBlank(s)){
-							ekpUpdate.set(TInsuranceEkp :: getResendFlag ,CommonConstants.ONE_INT);
+							ekpUpdate.set(TInsuranceEkp :: getResendFlag ,CommonConstants.ONE_INT)
+									.set(TInsuranceEkp :: getPushTime ,LocalDateTime.now());
 							update(ekpUpdate);
 						}else{
 							break;
@@ -176,9 +188,8 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
 						ekpParam.setInteractiveType(InsurancesConstants.ABOLISH_SETTLE_BILL);
 						s = ekpInsuranceUtil.sendToEkp(ekpParam);
 						if(StringUtils.isNotBlank(s)){
-							detailUpdate.set(TInsuranceDetail :: getDefaultSettleId,null);
-							tInsuranceDetailService.update(detailUpdate);
-							ekpUpdate.set(TInsuranceEkp :: getResendFlag ,CommonConstants.ONE_INT);
+							ekpUpdate.set(TInsuranceEkp :: getResendFlag ,CommonConstants.ONE_INT)
+									.set(TInsuranceEkp :: getPushTime ,LocalDateTime.now());
 							update(ekpUpdate);
 						}else{
 							break;
@@ -193,7 +204,8 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
 							ekpParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
 							s = ekpInsuranceUtil.sendToEkp(ekpParam);
 							if(StringUtils.isNotBlank(s)){
-								ekpUpdate.set(TInsuranceEkp :: getResendFlag ,CommonConstants.ONE_INT);
+								ekpUpdate.set(TInsuranceEkp :: getResendFlag ,CommonConstants.ONE_INT)
+										.set(TInsuranceEkp :: getPushTime ,LocalDateTime.now());
 								update(ekpUpdate);
 							}else{
 								break;
@@ -206,7 +218,8 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
 							ekpParam.setActualPremium(actualPremium.negate());
 							s = ekpInsuranceUtil.sendToEkp(ekpParam);
 							if(StringUtils.isNotBlank(s)){
-								ekpUpdate.set(TInsuranceEkp :: getResendFlag ,CommonConstants.ONE_INT);
+								ekpUpdate.set(TInsuranceEkp :: getResendFlag ,CommonConstants.ONE_INT)
+										.set(TInsuranceEkp :: getPushTime ,LocalDateTime.now());
 								update(ekpUpdate);
 							}else{
 								break;
@@ -224,7 +237,8 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
 					ekpParam.setInteractiveType(InsurancesConstants.CORRECT_SETTLE_BILL);
 					s = ekpInsuranceUtil.sendToEkp(ekpParam);
 					if(StringUtils.isNotBlank(s)){
-						ekpUpdate.set(TInsuranceEkp :: getResendFlag ,CommonConstants.ONE_INT);
+						ekpUpdate.set(TInsuranceEkp :: getResendFlag ,CommonConstants.ONE_INT)
+								.set(TInsuranceEkp :: getPushTime ,LocalDateTime.now());
 						update(ekpUpdate);
 					}else{
 						break;
@@ -236,13 +250,13 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
 					ekpParam.setInteractiveType(InsurancesConstants.CORRECT_SETTLE_BILL);
 					s = ekpInsuranceUtil.sendToEkp(ekpParam);
 					if(StringUtils.isNotBlank(s)){
-						ekpUpdate.set(TInsuranceEkp :: getResendFlag ,CommonConstants.ONE_INT);
+						ekpUpdate.set(TInsuranceEkp :: getResendFlag ,CommonConstants.ONE_INT)
+								.set(TInsuranceEkp :: getPushTime ,LocalDateTime.now());
 						update(ekpUpdate);
 					}else{
 						break;
 					}
 				}
-
 			}
 			return R.ok("发送成功");
 		}else{

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

@@ -32,8 +32,8 @@
             <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
             <result property="pushTime" column="PUSH_TIME" jdbcType="TIMESTAMP"/>
 			<result property="pushType" column="PUSH_TYPE" jdbcType="TINYINT"/>
-		<result property="settleType" column="SETTLE_TYPE" jdbcType="TINYINT"/>
-
+			<result property="settleType" column="SETTLE_TYPE" jdbcType="VARCHAR"/>
+			<result property="notResendMessage" column="NOT_RESEND_MESSAGE" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -45,7 +45,7 @@
         POLICY_END,BUY_STANDARD,MEDICAL_QUOTA,
         DIE_DISABLE_QUOTA,ACTUAL_PREMIUM,ESTIMATE_PREMIUM,
         SETTLE_MONTH,INTERACTIVE_TYPE,RESEND_FLAG,
-        CREATE_TIME,PUSH_TIME,PUSH_TYPE,SETTLE_TYPE
+        CREATE_TIME,PUSH_TIME,PUSH_TYPE,SETTLE_TYPE,NOT_RESEND_MESSAGE
     </sql>
 
 	<select id="getEkpRefundList" resultMap="BaseResultMap">
@@ -55,6 +55,7 @@
 			t_insurance_ekp
 		where
 			RESEND_FLAG = 0
+		order by CREATE_TIME asc
 	</select>