push

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiProductPlanController.java

@@ -35,6 +35,16 @@ public class ApiProductPlanController implements ApiProductPlanFeignClient {
     }
     }
 
 
     /**
     /**
+     * 编辑产品计划信息
+     * @param apiProductPlanInfoDto
+     * @return
+     */
+    @Override
+    public Result editPlan(ApiProductPlanInfoDto apiProductPlanInfoDto) {
+        return apiProductPlanService.editPlan(apiProductPlanInfoDto);
+    }
+
+    /**
      * 产品计划详情
      * 产品计划详情
      * @param planBizId
      * @param planBizId
      * @return
      * @return

yd-csf-api/src/main/java/com/yd/csf/api/service/ApiProductPlanService.java

@@ -13,6 +13,8 @@ public interface ApiProductPlanService {
 
 
     Result edit(ApiProductPlanMainInfoDto apiProductPlanMainInfoDto);
     Result edit(ApiProductPlanMainInfoDto apiProductPlanMainInfoDto);
 
 
+    Result editPlan(ApiProductPlanInfoDto apiProductPlanInfoDto);
+
     Result<ProductPlan> addProductPlanData(ApiProductPlanInfoDto dto, String appointmentBizId);
     Result<ProductPlan> addProductPlanData(ApiProductPlanInfoDto dto, String appointmentBizId);
 
 
     Result<ProductPlan> editProductPlanData(ApiProductPlanInfoDto dto,String appointmentBizId);
     Result<ProductPlan> editProductPlanData(ApiProductPlanInfoDto dto,String appointmentBizId);

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiProductPlanServiceImpl.java

@@ -78,14 +78,32 @@ public class ApiProductPlanServiceImpl implements ApiProductPlanService {
      * @return
      * @return
      */
      */
     @Override
     @Override
-    public Result edit(ApiProductPlanMainInfoDto apiProductPlanMainInfoDto) {
+    public Result<String> edit(ApiProductPlanMainInfoDto apiProductPlanMainInfoDto) {
 
 
         //编辑预约入参字段校验 - 产品计划信息字段校验 - 产品计划主信息字段校验
         //编辑预约入参字段校验 - 产品计划信息字段校验 - 产品计划主信息字段校验
         apiAppointmentCheckService.checkEditApiProductPlanMainInfoDto(apiProductPlanMainInfoDto);
         apiAppointmentCheckService.checkEditApiProductPlanMainInfoDto(apiProductPlanMainInfoDto);
 
 
         ApiProductPlanInfoDto productPlanInfoDto = new ApiProductPlanInfoDto();
         ApiProductPlanInfoDto productPlanInfoDto = new ApiProductPlanInfoDto();
         productPlanInfoDto.setApiProductPlanMainInfoDto(apiProductPlanMainInfoDto);
         productPlanInfoDto.setApiProductPlanMainInfoDto(apiProductPlanMainInfoDto);
-        editProductPlanData(productPlanInfoDto,apiProductPlanMainInfoDto.getAppointmentBizId());
+        Result<ProductPlan> result = editProductPlanData(productPlanInfoDto,apiProductPlanMainInfoDto.getAppointmentBizId());
+        String planBizId = "";
+        if (!Objects.isNull(result.getData())) {
+            planBizId = result.getData().getPlanBizId();
+        }
+        return Result.success(planBizId);
+    }
+
+    /**
+     * 编辑产品计划信息
+     * @param apiProductPlanInfoDto
+     * @return
+     */
+    @Override
+    public Result editPlan(ApiProductPlanInfoDto apiProductPlanInfoDto) {
+        //编辑产品计划主体信息
+        Result<String> result = edit(apiProductPlanInfoDto.getApiProductPlanMainInfoDto());
+        //批量编辑产品计划-附加险信息表数据
+        apiAdditionalService.batchEditAdditionalData(apiProductPlanInfoDto,result.getData());
         return Result.success();
         return Result.success();
     }
     }
 
 

yd-csf-feign/src/main/java/com/yd/csf/feign/client/productplan/ApiProductPlanFeignClient.java

@@ -26,6 +26,14 @@ public interface ApiProductPlanFeignClient {
     Result edit(@Validated @RequestBody ApiProductPlanMainInfoDto apiProductPlanMainInfoDto);
     Result edit(@Validated @RequestBody ApiProductPlanMainInfoDto apiProductPlanMainInfoDto);
 
 
     /**
     /**
+     * 编辑产品计划信息
+     * @param apiProductPlanInfoDto
+     * @return
+     */
+    @PutMapping("/edit/plan")
+    Result editPlan(@Validated @RequestBody ApiProductPlanInfoDto apiProductPlanInfoDto);
+
+    /**
      * 产品计划详情-根据产品计划信息表唯一业务ID查询
      * 产品计划详情-根据产品计划信息表唯一业务ID查询
      * @param appointmentBizId 预约信息主表唯一业务ID
      * @param appointmentBizId 预约信息主表唯一业务ID
      * @param planBizId 产品计划信息表唯一业务ID
      * @param planBizId 产品计划信息表唯一业务ID

yd-csf-feign/src/main/java/com/yd/csf/feign/fallback/productplan/ApiProductPlanFeignFallbackFactory.java

@@ -25,6 +25,11 @@ public class ApiProductPlanFeignFallbackFactory implements FallbackFactory<ApiPr
             }
             }
 
 
             @Override
             @Override
+            public Result editPlan(ApiProductPlanInfoDto apiProductPlanInfoDto) {
+                return null;
+            }
+
+            @Override
             public Result<ApiProductPlanInfoDto> detail(String appointmentBizId, String planBizId) {
             public Result<ApiProductPlanInfoDto> detail(String appointmentBizId, String planBizId) {
                 return null;
                 return null;
             }
             }