Merge branch 'feature-licancan' into 'develop'

Feature licancan

See merge request fangxinjiang/yifu!177

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

@@ -820,17 +820,9 @@ public class InsurancesConstants {
 	 */
 
 	/**
-	 * 减员退回的办理意见不能为空
-	 */
-	public static final String REFUND_MESSAGE_IS_EMPTY = "办理失败意见不能为空";
-
-	/**
-	 * 	该保单信息已被更新为减员退回
-	 */
-
-	/**
-	 * 该保单信息已被更新为减员成功
+	 * 减员/投保退回的办理意见不能为空
 	 */
+	public static final String ROLLBACK_MESSAGE_IS_EMPTY = "办理失败意见不能为空";
 
 	/**
 	 * 该保单信息已被删除
@@ -876,6 +868,10 @@ public class InsurancesConstants {
 	 * 当前为投保中状态，不可办理
 	 */
 	public static final String BUY_HANDLE_STATUS_TWO_HANDLE_ERROR = "当前为投保中状态，不可办理";
+	/**
+	 * 当前为非投保中状态，不可办理
+	 */
+	public static final String BUY_HANDLE_STATUS_NOT_TWO_HANDLE_ERROR = "当前为非投保中状态，不可办理";
 	/**
 	 * 当前为已投保状态，不可办理
 	 */

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRefundImportParam.java → yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceHandleImportParam.java

@@ -8,12 +8,12 @@ import java.io.Serializable;
 
 /**
  * @author zhaji
- * @description 减员办理导入校验
+ * @description 投保成功/退回/减员办理导入校验
  * @date 2022-08-22 10:15:19
  */
 @Data
-@Tag(name = "减员办理导入参数")
-public class InsuranceRefundImportParam implements Serializable {
+@Tag(name = "投保成功/退回/减员办理导入参数")
+public class InsuranceHandleImportParam implements Serializable {
 	private static final long serialVersionUID = -2689686777914935788L;
 
 	/**

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java

@@ -244,6 +244,23 @@ public class TInsuranceDetailController {
 		return tInsuranceDetailService.rollBackInsurance(user,paramList);
 	}
 
+	/**
+	 * 投保成功/退回办理导入
+	 *
+	 * @author licancan
+	 * @param param
+	 * @return {@link R<List<InsuranceHandleImportParam>>}
+	 */
+	@Operation(summary = "投保成功/退回办理导入", description = "投保成功/退回办理导入")
+	@PostMapping("/insuranceHandleImport")
+	public R<List<InsuranceHandleImportParam>> insuranceHandleImport(@RequestBody List<InsuranceHandleImportParam> param) {
+		YifuUser user = SecurityUtils.getUser();
+		if (user == null || Common.isEmpty(user.getId())) {
+			return R.failed(CommonConstants.PLEASE_LOG_IN);
+		}
+		return tInsuranceDetailService.insuranceHandleImport(user,param);
+	}
+
 	/**
 	 * 办理成功
 	 *
@@ -410,11 +427,11 @@ public class TInsuranceDetailController {
 	 *
 	 * @author zhaji
 	 * @param insuranceRefundImportList 减员信息
-	 * @return {@link R<List<InsuranceRefundImportParam>>}
+	 * @return {@link R<List< InsuranceHandleImportParam >>}
 	 */
 	@Operation(summary = "减员办理导入", description = "减员办理导入")
 	@PostMapping("/insuranceRefundImport")
-	public R insuranceRefundImport(@RequestBody List<InsuranceRefundImportParam> insuranceRefundImportList) {
+	public R insuranceRefundImport(@RequestBody List<InsuranceHandleImportParam> insuranceRefundImportList) {
 		return tInsuranceDetailService.insuranceRefundImport(insuranceRefundImportList);
 	}
 

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

@@ -159,6 +159,16 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 */
 	R<List<InsuranceListVO>> rollBackInsurance(YifuUser user, List<InsuranceHandleParam> paramList);
 
+	/**
+	 * 投保成功/退回办理导入
+	 *
+	 * @author licancan
+	 * @param user
+	 * @param param
+	 * @return {@link R<List<InsuranceHandleImportParam>>}
+	 */
+	R<List<InsuranceHandleImportParam>> insuranceHandleImport(YifuUser user,List<InsuranceHandleImportParam> param);
+
 	/**
 	 * 办理成功
 	 *
@@ -262,7 +272,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 * @param insuranceRefundImportList 减员办理导入
 	 * @return {@link R}
 	 */
-	R insuranceRefundImport(List<InsuranceRefundImportParam> insuranceRefundImportList);
+	R insuranceRefundImport(List<InsuranceHandleImportParam> insuranceRefundImportList);
 
 
 	/**