Merge branch 'feature-licancan' into 'develop'

Feature licancan

See merge request fangxinjiang/yifu!66

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

@@ -128,6 +128,10 @@ public class InsurancesConstants {
 	 * 投保状态不是投保中或已投保，无法退回
 	 */
 	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

@@ -583,7 +583,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					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());