push

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

@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yd.common.result.Result;
 import com.yd.product.api.service.ApiAnnouncementSpeciesService;
 import com.yd.product.feign.client.announcementspecies.ApiAnnouncementSpeciesFeignClient;
+import com.yd.product.feign.request.announcementspecies.ApiAnnouncementSpeciesDetailPageRequest;
 import com.yd.product.feign.request.announcementspecies.ApiAnnouncementSpeciesImportRequest;
 import com.yd.product.feign.request.announcementspecies.ApiAnnouncementSpeciesPageRequest;
+import com.yd.product.feign.response.announcementspecies.ApiAnnouncementSpeciesDetailPageResponse;
 import com.yd.product.feign.response.announcementspecies.ApiAnnouncementSpeciesPageResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -55,4 +57,14 @@ public class ApiAnnouncementSpeciesController implements ApiAnnouncementSpeciesF
     public Result delSpecies(String announcementSpeciesBizId) {
         return null;
     }
+
+    /**
+     * 分页列表查询-公告佣比率规格和明细信息平铺列表
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiAnnouncementSpeciesDetailPageResponse>> page(ApiAnnouncementSpeciesDetailPageRequest request) {
+        return apiAnnouncementSpeciesService.page(request);
+    }
 }

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

@@ -2,8 +2,10 @@ 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.announcementspecies.ApiAnnouncementSpeciesDetailPageRequest;
 import com.yd.product.feign.request.announcementspecies.ApiAnnouncementSpeciesImportRequest;
 import com.yd.product.feign.request.announcementspecies.ApiAnnouncementSpeciesPageRequest;
+import com.yd.product.feign.response.announcementspecies.ApiAnnouncementSpeciesDetailPageResponse;
 import com.yd.product.feign.response.announcementspecies.ApiAnnouncementSpeciesPageResponse;
 import com.yd.product.service.model.AnnouncementSpecies;
 
@@ -12,5 +14,7 @@ public interface ApiAnnouncementSpeciesService {
 
     Result importSpecies(ApiAnnouncementSpeciesImportRequest request);
 
+    Result<IPage<ApiAnnouncementSpeciesDetailPageResponse>> page(ApiAnnouncementSpeciesDetailPageRequest request);
+
     Result<AnnouncementSpecies> checkAnnouncementSpeciesIsExist(String productLaunchBizId);
 }

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

@@ -12,8 +12,10 @@ import com.yd.product.api.service.ApiProductLaunchService;
 import com.yd.product.api.service.ApiSpeciesPriceService;
 import com.yd.product.api.service.ApiSpeciesSettingService;
 import com.yd.product.feign.dto.ApiSpeciesPriceDto;
+import com.yd.product.feign.request.announcementspecies.ApiAnnouncementSpeciesDetailPageRequest;
 import com.yd.product.feign.request.announcementspecies.ApiAnnouncementSpeciesImportRequest;
 import com.yd.product.feign.request.announcementspecies.ApiAnnouncementSpeciesPageRequest;
+import com.yd.product.feign.response.announcementspecies.ApiAnnouncementSpeciesDetailPageResponse;
 import com.yd.product.feign.response.announcementspecies.ApiAnnouncementSpeciesPageResponse;
 import com.yd.product.service.model.AnnouncementSpecies;
 import com.yd.product.service.service.IAnnouncementCommissionRatioService;
@@ -102,6 +104,18 @@ public class ApiAnnouncementSpeciesServiceImpl implements ApiAnnouncementSpecies
     }
 
     /**
+     * 分页列表查询-公告佣比率规格和明细信息平铺列表
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiAnnouncementSpeciesDetailPageResponse>> page(ApiAnnouncementSpeciesDetailPageRequest request) {
+        Page<ApiAnnouncementSpeciesDetailPageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
+        IPage<ApiAnnouncementSpeciesDetailPageResponse> iPage = iAnnouncementSpeciesService.page(page, request);
+        return Result.success(iPage);
+    }
+
+    /**
      * 校验公告佣比率规格信息是否存在
      * @param announcementSpeciesBizId
      * @return

yd-product-feign/src/main/java/com/yd/product/feign/client/announcementspecies/ApiAnnouncementSpeciesFeignClient.java

@@ -2,6 +2,7 @@ package com.yd.product.feign.client.announcementspecies;
 
 import com.yd.common.result.Result;
 import com.yd.product.feign.fallback.announcementspecies.ApiAnnouncementSpeciesFeignFallbackFactory;
+import com.yd.product.feign.request.announcementspecies.ApiAnnouncementSpeciesDetailPageRequest;
 import com.yd.product.feign.request.announcementspecies.ApiAnnouncementSpeciesImportRequest;
 import com.yd.product.feign.request.announcementspecies.ApiAnnouncementSpeciesPageRequest;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -15,7 +16,7 @@ import javax.validation.constraints.NotBlank;
 /**
  * 产品服务-公告佣比率规格信息Feign客户端
  */
-@FeignClient(name = "yd-product-api", fallbackFactory = ApiAnnouncementSpeciesFeignFallbackFactory.class)
+@FeignClient(name = "yd-product-api",path = "/product/api/announcementSpecies",fallbackFactory = ApiAnnouncementSpeciesFeignFallbackFactory.class)
 public interface ApiAnnouncementSpeciesFeignClient {
 
     /**
@@ -41,4 +42,12 @@ public interface ApiAnnouncementSpeciesFeignClient {
      */
     @DeleteMapping("/del/species")
     Result delSpecies(@NotBlank(message = "公告佣比率规格表唯一业务ID不能为空") @RequestParam(value = "announcementSpeciesBizId") String announcementSpeciesBizId);
+
+    /**
+     * 分页列表查询-公告佣比率规格和明细信息平铺列表
+     * @param request
+     * @return
+     */
+    @PostMapping("/detail/page")
+    Result page(@RequestBody ApiAnnouncementSpeciesDetailPageRequest request);
 }

yd-product-feign/src/main/java/com/yd/product/feign/fallback/announcementspecies/ApiAnnouncementSpeciesFeignFallbackFactory.java

@@ -2,6 +2,7 @@ package com.yd.product.feign.fallback.announcementspecies;
 
 import com.yd.common.result.Result;
 import com.yd.product.feign.client.announcementspecies.ApiAnnouncementSpeciesFeignClient;
+import com.yd.product.feign.request.announcementspecies.ApiAnnouncementSpeciesDetailPageRequest;
 import com.yd.product.feign.request.announcementspecies.ApiAnnouncementSpeciesImportRequest;
 import com.yd.product.feign.request.announcementspecies.ApiAnnouncementSpeciesPageRequest;
 import lombok.extern.slf4j.Slf4j;
@@ -31,6 +32,11 @@ public class ApiAnnouncementSpeciesFeignFallbackFactory implements FallbackFacto
             public Result delSpecies(String announcementSpeciesBizId) {
                 return null;
             }
+
+            @Override
+            public Result page(ApiAnnouncementSpeciesDetailPageRequest request) {
+                return null;
+            }
         };
     }
 }

yd-product-feign/src/main/java/com/yd/product/feign/request/announcementspecies/ApiAnnouncementSpeciesDetailPageRequest.java

+package com.yd.product.feign.request.announcementspecies;
+
+import com.yd.common.dto.PageDto;
+import lombok.Data;
+
+@Data
+public class ApiAnnouncementSpeciesDetailPageRequest extends PageDto {
+
+    /**
+     * 产品上架信息表唯一业务ID
+     */
+    private String productLaunchBizId;
+}

yd-product-feign/src/main/java/com/yd/product/feign/response/announcementspecies/ApiAnnouncementSpeciesDetailPageResponse.java

+package com.yd.product.feign.response.announcementspecies;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class ApiAnnouncementSpeciesDetailPageResponse {
+
+    //======公告佣比率规格表信息start======
+    /**
+     * 公告佣比率规格表唯一业务ID
+     */
+    private String announcementSpeciesBizId;
+
+    /**
+     * 产品上架信息表唯一业务ID
+     */
+    private String productLaunchBizId;
+
+    /**
+     * 产品唯一业务ID
+     */
+    private String productBizId;
+
+    /**
+     * 保障计划（0-64岁等）(固定规格条件)
+     */
+    private String protectionPlan;
+
+    /**
+     * 供款年期（5、10、20年期等）(固定规格条件)
+     */
+    private String paymentTerm;
+
+    //======公告佣比率规格表信息end======
+
+
+    //======公告佣比率规格明细表信息start======
+    /**
+     * 公告佣比率规格明细表唯一业务ID
+     */
+    private String announcementCommissionRatioBizId;
+
+    /**
+     * 费用名称（转介费等）
+     */
+    private String expenseName;
+
+    /**
+     * 佣金年限（起）
+     */
+    private String startPeriod;
+
+    /**
+     * 佣金年限（止）
+     */
+    private String endPeriod;
+
+    /**
+     * 标保折算比例（基本保费）
+     */
+    private BigDecimal discountRatio;
+
+    /**
+     * 计算基数（保费/保费*折算比例）
+     */
+    private BigDecimal cardinalNumber;
+
+    /**
+     * 佣金率
+     */
+    private BigDecimal commissionRate;
+
+    /**
+     * 有效开始时间
+     */
+    private LocalDateTime effectiveStart;
+
+    /**
+     * 有效结束时间
+     */
+    private LocalDateTime effectiveEnd;
+
+    /**
+     * 适用范围（经纪人/分销员/加盟商/签单员/转介人/全部，字典）
+     */
+    private String scope;
+
+    /**
+     * 是否受汇率影响 0-否 1-是，字典）
+     */
+    private String isExchangeRate;
+
+    /**
+     * 结算币种（字典）
+     */
+    private String currency;
+    //======公告佣比率规格明细表信息end======
+}

yd-product-service/src/main/java/com/yd/product/service/dao/AnnouncementSpeciesMapper.java

@@ -3,7 +3,9 @@ package com.yd.product.service.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.product.feign.request.announcementspecies.ApiAnnouncementSpeciesDetailPageRequest;
 import com.yd.product.feign.request.announcementspecies.ApiAnnouncementSpeciesPageRequest;
+import com.yd.product.feign.response.announcementspecies.ApiAnnouncementSpeciesDetailPageResponse;
 import com.yd.product.feign.response.announcementspecies.ApiAnnouncementSpeciesPageResponse;
 import com.yd.product.service.model.AnnouncementSpecies;
 import org.apache.ibatis.annotations.Param;
@@ -20,4 +22,7 @@ public interface AnnouncementSpeciesMapper extends BaseMapper<AnnouncementSpecie
 
     IPage<ApiAnnouncementSpeciesPageResponse> page(@Param("page") Page<ApiAnnouncementSpeciesPageResponse> page,
                                                    @Param("request") ApiAnnouncementSpeciesPageRequest request);
+
+    IPage<ApiAnnouncementSpeciesDetailPageResponse> detailPage(@Param("page")Page<ApiAnnouncementSpeciesDetailPageResponse> page,
+                                                               @Param("request") ApiAnnouncementSpeciesDetailPageRequest request);
 }

yd-product-service/src/main/java/com/yd/product/service/service/IAnnouncementSpeciesService.java

@@ -3,7 +3,9 @@ package com.yd.product.service.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yd.product.feign.request.announcementspecies.ApiAnnouncementSpeciesDetailPageRequest;
 import com.yd.product.feign.request.announcementspecies.ApiAnnouncementSpeciesPageRequest;
+import com.yd.product.feign.response.announcementspecies.ApiAnnouncementSpeciesDetailPageResponse;
 import com.yd.product.feign.response.announcementspecies.ApiAnnouncementSpeciesPageResponse;
 import com.yd.product.service.model.AnnouncementSpecies;
 
@@ -27,4 +29,7 @@ public interface IAnnouncementSpeciesService extends IService<AnnouncementSpecie
     List<AnnouncementSpecies> queryList(String productLaunchBizId);
 
     Boolean delByProductLaunchBizId(String productLaunchBizId);
+
+    IPage<ApiAnnouncementSpeciesDetailPageResponse> page(Page<ApiAnnouncementSpeciesDetailPageResponse> page,
+                                                         ApiAnnouncementSpeciesDetailPageRequest request);
 }

yd-product-service/src/main/java/com/yd/product/service/service/impl/AnnouncementSpeciesServiceImpl.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yd.product.feign.request.announcementspecies.ApiAnnouncementSpeciesDetailPageRequest;
 import com.yd.product.feign.request.announcementspecies.ApiAnnouncementSpeciesPageRequest;
+import com.yd.product.feign.response.announcementspecies.ApiAnnouncementSpeciesDetailPageResponse;
 import com.yd.product.feign.response.announcementspecies.ApiAnnouncementSpeciesPageResponse;
 import com.yd.product.service.dao.AnnouncementSpeciesMapper;
 import com.yd.product.service.model.AnnouncementSpecies;
@@ -47,5 +49,11 @@ public class AnnouncementSpeciesServiceImpl extends ServiceImpl<AnnouncementSpec
                 .eq(AnnouncementSpecies::getProductLaunchBizId,productLaunchBizId));
     }
 
+    @Override
+    public IPage<ApiAnnouncementSpeciesDetailPageResponse> page(Page<ApiAnnouncementSpeciesDetailPageResponse> page,
+                                                                ApiAnnouncementSpeciesDetailPageRequest request) {
+        return this.baseMapper.detailPage(page,request);
+    }
+
 
 }

yd-product-service/src/main/resources/mappers/AnnouncementSpeciesMapper.xml

@@ -47,4 +47,16 @@
         </where>
         order by a.id asc
     </select>
+
+    <select id="detailPage"
+            resultType="com.yd.product.feign.response.announcementspecies.ApiAnnouncementSpeciesDetailPageResponse">
+        select acr.*,a.* from announcement_commission_ratio acr
+        left join announcement_species a on a.announcement_species_biz_id = acr.announcement_species_biz_id and a.is_deleted = 0
+        <where>
+            <if test="request.productLaunchBizId != null and request.productLaunchBizId != ''">
+                and a.product_launch_biz_id = #{request.productLaunchBizId}
+            </if>
+            and acr.is_deleted = 0
+        </where>
+    </select>
 </mapper>
\ No newline at end of file