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

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

@@ -125,9 +125,13 @@ public class InsurancesConstants {
 	 */
 	public static final String REDUCE_REPLACE_IS_NOT_ALLOW = "当前记录在减员流程中，无法替换";
 	/**
-	 * 投保状态不是投保中或已投保，无法退回
+	 * 投保状态不是待投保、投保中、已投保，无法退回
 	 */
-	public static final String REDUCE_ROLLBACK_IS_NOT_ALLOW = "投保状态不是投保中或已投保，无法退回";
+	public static final String REDUCE_ROLLBACK_IS_NOT_ALLOW = "投保状态不是待投保、投保中、已投保，无法退回";
+	/**
+	 * 减员中，无法退回
+	 */
+	public static final String REDUCE_ROLLBACK_REDUCE_IS_NOT_ALLOW = "减员中，无法退回";
 	/**
 	 * 员工姓名不能为空
 	 */

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

@@ -577,13 +577,20 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		List<TInsuranceDetail> successList = new ArrayList<>();
 		if (CollectionUtils.isNotEmpty(detailList)){
 			for (TInsuranceDetail detail : detailList) {
-				if (detail.getBuyHandleStatus() != CommonConstants.TWO_INT
-				 	&& detail.getBuyHandleStatus() != CommonConstants.THREE_INT){
+				if (detail.getBuyHandleStatus() == CommonConstants.FOUR_INT
+				 	|| detail.getBuyHandleStatus() == CommonConstants.FIVE_INT){
 					InsuranceListVO listVO = new InsuranceListVO();
 					BeanCopyUtils.copyProperties(detail,listVO);
 					listVO.setErrorMessage(InsurancesConstants.REDUCE_ROLLBACK_IS_NOT_ALLOW);
 					errorList.add(listVO);
-				}else {
+				}else if(detail.getBuyHandleStatus() == CommonConstants.THREE_INT
+						&& (detail.getReduceHandleStatus() != null && (detail.getReduceHandleStatus() == CommonConstants.ONE_INT
+						|| detail.getReduceHandleStatus() == CommonConstants.TWO_INT))){
+					InsuranceListVO listVO = new InsuranceListVO();
+					BeanCopyUtils.copyProperties(detail,listVO);
+					listVO.setErrorMessage(InsurancesConstants.REDUCE_ROLLBACK_REDUCE_IS_NOT_ALLOW);
+					errorList.add(listVO);
+				}else{
 					// 记录状态置为「退回」
 					detail.setBuyHandleStatus(CommonConstants.FOUR_INT);
 					detail.setUpdateBy(user.getId());