push

yd-product-api/src/main/java/com/yd/product/api/controller/ApiExpectedCommissionRatioController.java

@@ -5,6 +5,7 @@ import com.yd.common.result.Result;
 import com.yd.product.api.service.ApiExpectedCommissionRatioService;
 import com.yd.product.feign.client.expectedcommissionratio.ApiExpectedCommissionRatioFeignClient;
 import com.yd.product.feign.request.expectedcommissionratio.ApiExpectedCommissionRatioAddRequest;
+import com.yd.product.feign.request.expectedcommissionratio.ApiExpectedCommissionRatioBatchSaveRequest;
 import com.yd.product.feign.request.expectedcommissionratio.ApiExpectedCommissionRatioEditRequest;
 import com.yd.product.feign.request.expectedcommissionratio.ApiExpectedCommissionRatioPageRequest;
 import com.yd.product.feign.response.expectedcommissionratio.ApiExpectedCommissionRatioDetailResponse;
@@ -40,6 +41,16 @@ public class ApiExpectedCommissionRatioController implements ApiExpectedCommissi
     }
 
     /**
+     * 批量保存-来佣比率规格明细信息
+     * @param request
+     * @return
+     */
+    @Override
+    public Result batchSave(ApiExpectedCommissionRatioBatchSaveRequest request) {
+        return apiExpectedCommissionRatioService.batchSave(request);
+    }
+
+    /**
      * 添加-来佣比率规格明细信息
      * @param request
      * @return

yd-product-api/src/main/java/com/yd/product/api/service/ApiExpectedCommissionRatioService.java

@@ -3,6 +3,7 @@ package com.yd.product.api.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yd.common.result.Result;
 import com.yd.product.feign.request.expectedcommissionratio.ApiExpectedCommissionRatioAddRequest;
+import com.yd.product.feign.request.expectedcommissionratio.ApiExpectedCommissionRatioBatchSaveRequest;
 import com.yd.product.feign.request.expectedcommissionratio.ApiExpectedCommissionRatioEditRequest;
 import com.yd.product.feign.request.expectedcommissionratio.ApiExpectedCommissionRatioPageRequest;
 import com.yd.product.feign.response.expectedcommissionratio.ApiExpectedCommissionRatioDetailResponse;
@@ -13,6 +14,8 @@ public interface ApiExpectedCommissionRatioService {
 
     Result<IPage<ApiExpectedCommissionRatioPageResponse>> page(ApiExpectedCommissionRatioPageRequest request);
 
+    Result batchSave(ApiExpectedCommissionRatioBatchSaveRequest request);
+
     Result add(ApiExpectedCommissionRatioAddRequest request);
 
     Result edit(ApiExpectedCommissionRatioEditRequest request);

yd-product-api/src/main/java/com/yd/product/api/service/impl/ApiExpectedCommissionRatioServiceImpl.java

@@ -8,18 +8,26 @@ import com.yd.common.result.Result;
 import com.yd.common.utils.RandomStringGenerator;
 import com.yd.product.api.service.ApiExpectedCommissionRatioService;
 import com.yd.product.api.service.ApiExpectedSpeciesService;
+import com.yd.product.feign.dto.ApiExpectedCommissionRatioBatchSaveDto;
 import com.yd.product.feign.request.expectedcommissionratio.ApiExpectedCommissionRatioAddRequest;
+import com.yd.product.feign.request.expectedcommissionratio.ApiExpectedCommissionRatioBatchSaveRequest;
 import com.yd.product.feign.request.expectedcommissionratio.ApiExpectedCommissionRatioEditRequest;
 import com.yd.product.feign.request.expectedcommissionratio.ApiExpectedCommissionRatioPageRequest;
 import com.yd.product.feign.response.expectedcommissionratio.ApiExpectedCommissionRatioDetailResponse;
 import com.yd.product.feign.response.expectedcommissionratio.ApiExpectedCommissionRatioPageResponse;
+import com.yd.product.service.model.AnnouncementCommissionRatio;
 import com.yd.product.service.model.ExpectedCommissionRatio;
 import com.yd.product.service.service.IExpectedCommissionRatioService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -44,6 +52,33 @@ public class ApiExpectedCommissionRatioServiceImpl implements ApiExpectedCommiss
     }
 
     /**
+     * 批量保存-来佣比率规格明细信息
+     * @param request
+     * @return
+     */
+    @Override
+    public Result batchSave(ApiExpectedCommissionRatioBatchSaveRequest request) {
+        List<String> expectedSpeciesBizIdList = new ArrayList<>();
+        expectedSpeciesBizIdList.add(request.getExpectedSpeciesBizId());
+        //先删后新增
+        iExpectedCommissionRatioService.del(expectedSpeciesBizIdList);
+
+        //新增
+        if (!CollectionUtils.isEmpty(request.getRatioBatchSaveDtoList())) {
+            List<ExpectedCommissionRatio> saveList = request.getRatioBatchSaveDtoList()
+                    .stream()
+                    .map(dto -> {
+                        ExpectedCommissionRatio ratio = new ExpectedCommissionRatio();
+                        BeanUtils.copyProperties(dto,ratio);
+                        ratio.setExpectedCommissionRatioBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_EXPECTED_COMMISSION_RATIO.getCode()));
+                        return ratio;
+                    }).collect(Collectors.toList());
+            iExpectedCommissionRatioService.saveOrUpdateBatch(saveList);
+        }
+        return Result.success();
+    }
+
+    /**
      * 添加-来佣比率规格明细信息
      * @param request
      * @return

yd-product-feign/src/main/java/com/yd/product/feign/client/expectedcommissionratio/ApiExpectedCommissionRatioFeignClient.java

@@ -2,7 +2,9 @@ package com.yd.product.feign.client.expectedcommissionratio;
 
 import com.yd.common.result.Result;
 import com.yd.product.feign.fallback.expectedcommissionratio.ApiExpectedCommissionRatioFeignFallbackFactory;
+import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioBatchSaveRequest;
 import com.yd.product.feign.request.expectedcommissionratio.ApiExpectedCommissionRatioAddRequest;
+import com.yd.product.feign.request.expectedcommissionratio.ApiExpectedCommissionRatioBatchSaveRequest;
 import com.yd.product.feign.request.expectedcommissionratio.ApiExpectedCommissionRatioEditRequest;
 import com.yd.product.feign.request.expectedcommissionratio.ApiExpectedCommissionRatioPageRequest;
 import com.yd.product.feign.response.expectedcommissionratio.ApiExpectedCommissionRatioDetailResponse;
@@ -26,6 +28,14 @@ public interface ApiExpectedCommissionRatioFeignClient {
     Result page(@RequestBody ApiExpectedCommissionRatioPageRequest request);
 
     /**
+     * 批量保存-来佣比率规格明细信息
+     * @param request
+     * @return
+     */
+    @PostMapping("/batch/save")
+    Result batchSave(@Validated @RequestBody ApiExpectedCommissionRatioBatchSaveRequest request);
+
+    /**
      * 添加-来佣比率规格明细信息
      * @param request
      * @return

yd-product-feign/src/main/java/com/yd/product/feign/dto/ApiExpectedCommissionRatioBatchSaveDto.java

+package com.yd.product.feign.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class ApiExpectedCommissionRatioBatchSaveDto {
+
+    /**
+     * 费用名称（转介费等）
+     */
+    @NotBlank(message = "费用名称（转介费等）不能为空")
+    private String expenseName;
+
+    /**
+     * 佣金年限（起）
+     */
+    @NotBlank(message = "佣金年限（起）不能为空")
+    private String startPeriod;
+
+    /**
+     * 佣金年限（止）
+     */
+    @NotBlank(message = "佣金年限（止）不能为空")
+    private String endPeriod;
+
+    /**
+     * 标保折算比例（基本保费）
+     */
+    @NotNull(message = "标保折算比例（基本保费）不能为空")
+    private BigDecimal discountRatio;
+
+    /**
+     * 佣金率
+     */
+    @NotNull(message = "佣金率不能为空")
+    private BigDecimal commissionRate;
+
+    /**
+     * 有效开始时间
+     */
+    @NotNull(message = "有效开始时间不能为空")
+    private LocalDateTime effectiveStart;
+
+    /**
+     * 有效结束时间
+     */
+    @NotNull(message = "有效结束时间不能为空")
+    private LocalDateTime effectiveEnd;
+
+    /**
+     * 是否受汇率影响 0-否 1-是，字典）
+     */
+    @NotBlank(message = "是否受汇率影响不能为空")
+    private String isExchangeRate;
+
+    /**
+     * 结算币种（字典）
+     */
+    @NotBlank(message = "结算币种不能为空")
+    private String currency;
+
+    /**
+     * 对账公司
+     */
+    private String reconciliationCompany;
+
+    /**
+     * 销售组织
+     */
+    private String salesOrg;
+
+    /**
+     * 状态(0:停用 1:启用)
+     */
+    @NotNull(message = "状态不能为空")
+    private Integer status;
+}

yd-product-feign/src/main/java/com/yd/product/feign/fallback/expectedcommissionratio/ApiExpectedCommissionRatioFeignFallbackFactory.java

@@ -3,6 +3,7 @@ package com.yd.product.feign.fallback.expectedcommissionratio;
 import com.yd.common.result.Result;
 import com.yd.product.feign.client.expectedcommissionratio.ApiExpectedCommissionRatioFeignClient;
 import com.yd.product.feign.request.expectedcommissionratio.ApiExpectedCommissionRatioAddRequest;
+import com.yd.product.feign.request.expectedcommissionratio.ApiExpectedCommissionRatioBatchSaveRequest;
 import com.yd.product.feign.request.expectedcommissionratio.ApiExpectedCommissionRatioEditRequest;
 import com.yd.product.feign.request.expectedcommissionratio.ApiExpectedCommissionRatioPageRequest;
 import com.yd.product.feign.response.expectedcommissionratio.ApiExpectedCommissionRatioDetailResponse;
@@ -27,6 +28,11 @@ public class ApiExpectedCommissionRatioFeignFallbackFactory implements FallbackF
             }
 
             @Override
+            public Result batchSave(ApiExpectedCommissionRatioBatchSaveRequest request) {
+                return null;
+            }
+
+            @Override
             public Result add(ApiExpectedCommissionRatioAddRequest request) {
                 return null;
             }

yd-product-feign/src/main/java/com/yd/product/feign/request/expectedcommissionratio/ApiExpectedCommissionRatioBatchSaveRequest.java

+package com.yd.product.feign.request.expectedcommissionratio;
+
+import com.yd.product.feign.dto.ApiExpectedCommissionRatioBatchSaveDto;
+import lombok.Data;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@Data
+public class ApiExpectedCommissionRatioBatchSaveRequest {
+
+    /**
+     * 来佣比率规格表唯一业务ID
+     */
+    @NotBlank(message = "来佣比率规格表唯一业务ID不能为空")
+    private String expectedSpeciesBizId;
+
+    /**
+     * 来佣比率规格明细列表
+     */
+    @NotEmpty(message = "来佣比率规格明细列表不能为空")
+    private List<ApiExpectedCommissionRatioBatchSaveDto> ratioBatchSaveDtoList;
+}