Merge branch 'feature-zhaji' into 'develop'

Feature zhaji

See merge request fangxinjiang/yifu!83

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

@@ -436,6 +436,11 @@ public class InsurancesConstants {
 	 */
 	public static final String SETTLE_MONTH_CHANGE_BUY_STATUS_TWO_ERROR = "商险投保中，无法变更结算月";
 
+	/**
+	 * 商险投保退回，无法变更结算月
+	 */
+	public static final String SETTLE_MONTH_CHANGE_BUY_STATUS_FOUR_ERROR = "商险投保退回，无法变更结算月";
+
 	/**
 	 * 商险已减员，无法变更结算月
 	 */
@@ -493,11 +498,21 @@ public class InsurancesConstants {
 	 */
 	public static final String DEPT_NO_CHANGE_BUY_STATUS_TWO_ERROR = "商险投保中，无法变更项目";
 
+	/**
+	 * 商险投保退回，无法变更项目
+	 */
+	public static final String DEPT_NO_CHANGE_BUY_STATUS_FOUR_ERROR = "商险投保退回，无法变更项目";
+
 	/**
 	 * 商险已减员，无法变更项目
 	 */
 	public static final String DEPT_NO_CHANGE_REFUND_STATUS_FOUR_ERROR = "商险已减员，无法变更项目";
 
+	/**
+	 * 商险已减员，无法变更项目
+	 */
+	public static final String DEPT_NO_CHANGE_REFUND_STATUS_ONE_ERROR = "商险减员中，无法变更项目";
+
 	/**
 	 * 商险结算中，无法变更项目
 	 */

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

@@ -3093,22 +3093,31 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				continue;
 			}
 			Integer buyType = insuranceDetail.getBuyType();
+			//替换类型无法变更结算月
 			if (CommonConstants.FOUR_INT == buyType){
 				param.setErrorMessage(InsurancesConstants.SETTLE_MONTH_CHANGE_IS_EFFECT_ERROR);
 				errorList.add(param);
 				continue;
 			}
 			Integer buyHandleStatus = insuranceDetail.getBuyHandleStatus();
+			//商险待投保，无法变更结算月
 			if (CommonConstants.ONE_INT == buyHandleStatus){
 				param.setErrorMessage(InsurancesConstants.SETTLE_MONTH_CHANGE_BUY_STATUS_ONE_ERROR);
 				errorList.add(param);
 				continue;
 			}
+			//商险投保中，无法变更结算月
 			if (CommonConstants.TWO_INT == buyHandleStatus){
 				param.setErrorMessage(InsurancesConstants.SETTLE_MONTH_CHANGE_BUY_STATUS_TWO_ERROR);
 				errorList.add(param);
 				continue;
 			}
+			//商险投保退回，无法变更结算月
+			if (CommonConstants.FOUR_INT == buyHandleStatus){
+				param.setErrorMessage(InsurancesConstants.SETTLE_MONTH_CHANGE_BUY_STATUS_FOUR_ERROR);
+				errorList.add(param);
+				continue;
+			}
 			//如果结算月份相同
 			if (settleMonth.equals(insuranceDetail.getSettleMonth())){
 				param.setErrorMessage(InsurancesConstants.SETTLE_MONTH_IDENTICAL);
@@ -3143,13 +3152,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				}
 			}
 			//当前保单信息的为已减员时不能变更结算月
-			if(null != insuranceDetail.getBuyHandleStatus()){
-				if( CommonConstants.FIVE_INT == insuranceDetail.getBuyHandleStatus() ){
+			if(null != insuranceDetail.getReduceHandleStatus()){
+				if( CommonConstants.FOUR_INT == insuranceDetail.getReduceHandleStatus() ){
 					param.setErrorMessage(InsurancesConstants.SETTLE_MONTH_CHANGE_REFUND_STATUS_FOUR_ERROR);
 					errorList.add(param);
 					continue;
 				}
-				if( CommonConstants.ONE_INT == insuranceDetail.getBuyHandleStatus() || CommonConstants.TWO_INT == insuranceDetail.getBuyHandleStatus()){
+				//减员流程中，无法变更结算月
+				if(CommonConstants.ONE_INT == insuranceDetail.getReduceHandleStatus()
+						|| CommonConstants.TWO_INT == insuranceDetail.getReduceHandleStatus()){
 					param.setErrorMessage(InsurancesConstants.SETTLE_MONTH_CHANGE_REFUND_STATUS_ONE_ERROR);
 					errorList.add(param);
 					continue;
@@ -3306,22 +3317,37 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				continue;
 			}
 			Integer buyHandleStatus = insuranceDetail.getBuyHandleStatus();
+			//商险待投保，无法变更项目
 			if (CommonConstants.ONE_INT == buyHandleStatus){
 				param.setErrorMessage(InsurancesConstants.DEPT_NO_CHANGE_BUY_STATUS_ONE_ERROR);
 				errorList.add(param);
 				continue;
 			}
+			//商险投保中，无法变更项目
 			if (CommonConstants.TWO_INT == buyHandleStatus){
 				param.setErrorMessage(InsurancesConstants.DEPT_NO_CHANGE_BUY_STATUS_TWO_ERROR);
 				errorList.add(param);
 				continue;
 			}
+			//商险投保退回，无法变更项目
+			if (CommonConstants.FOUR_INT == buyHandleStatus){
+				param.setErrorMessage(InsurancesConstants.DEPT_NO_CHANGE_BUY_STATUS_FOUR_ERROR);
+				errorList.add(param);
+				continue;
+			}
 			//当前保单信息的为已减员时，不能变更结算项目
-			if( null != insuranceDetail.getBuyHandleStatus() && CommonConstants.FIVE_INT == insuranceDetail.getBuyHandleStatus() ){
+			if( null != insuranceDetail.getReduceHandleStatus()){
+				if (CommonConstants.FIVE_INT == insuranceDetail.getReduceHandleStatus()){
 					param.setErrorMessage(InsurancesConstants.DEPT_NO_CHANGE_REFUND_STATUS_FOUR_ERROR);
 					errorList.add(param);
 					continue;
 				}
+				if(CommonConstants.ONE_INT == insuranceDetail.getReduceHandleStatus() || CommonConstants.TWO_INT == insuranceDetail.getReduceHandleStatus()){
+					param.setErrorMessage(InsurancesConstants.DEPT_NO_CHANGE_REFUND_STATUS_ONE_ERROR);
+					errorList.add(param);
+					continue;
+				}
+			}
 			String defaultSettleId = insuranceDetail.getDefaultSettleId();
 			if (StringUtils.isNotBlank(defaultSettleId)){
 				//查询结算状态