Commit 1f5c56aa by zhangxingmin

push

parent 72790754
...@@ -4,18 +4,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -4,18 +4,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.product.api.service.ApiAnnouncementCommissionRatioService; import com.yd.product.api.service.ApiAnnouncementCommissionRatioService;
import com.yd.product.feign.client.announcementcommissionratio.ApiAnnouncementCommissionRatioFeignClient; import com.yd.product.feign.client.announcementcommissionratio.ApiAnnouncementCommissionRatioFeignClient;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioBatchSaveRequest; import com.yd.product.feign.request.announcementcommissionratio.*;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioEditRequest;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioPageRequest;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioAddRequest;
import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioDetailResponse; import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioDetailResponse;
import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioListResponse;
import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioPageResponse; import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioPageResponse;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import javax.validation.constraints.NotBlank;
/** /**
* 公告佣比率规格明细信息 * 公告佣比率规格明细信息
...@@ -42,6 +39,16 @@ public class ApiAnnouncementCommissionRatioController implements ApiAnnouncement ...@@ -42,6 +39,16 @@ public class ApiAnnouncementCommissionRatioController implements ApiAnnouncement
} }
/** /**
* 列表查询-条件查询-公告佣比率规格明细信息列表
* @param request
* @return
*/
@Override
public Result<List<ApiAnnouncementCommissionRatioListResponse>> list(ApiAnnouncementCommissionRatioListRequest request) {
return Result.success(apiAnnouncementCommissionRatioService.conditionList(request));
}
/**
* 批量保存-公告佣比率规格明细信息 * 批量保存-公告佣比率规格明细信息
* @param request * @param request
* @return * @return
......
...@@ -2,17 +2,21 @@ package com.yd.product.api.service; ...@@ -2,17 +2,21 @@ package com.yd.product.api.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioBatchSaveRequest; import com.yd.product.feign.request.announcementcommissionratio.*;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioEditRequest;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioPageRequest;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioAddRequest;
import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioDetailResponse; import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioDetailResponse;
import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioListResponse;
import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioPageResponse; import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioPageResponse;
import com.yd.product.service.model.AnnouncementCommissionRatio; import com.yd.product.service.model.AnnouncementCommissionRatio;
import java.util.List;
public interface ApiAnnouncementCommissionRatioService { public interface ApiAnnouncementCommissionRatioService {
Result<IPage<ApiAnnouncementCommissionRatioPageResponse>> page(ApiAnnouncementCommissionRatioPageRequest request); Result<IPage<ApiAnnouncementCommissionRatioPageResponse>> page(ApiAnnouncementCommissionRatioPageRequest request);
Result<List<ApiAnnouncementCommissionRatioListResponse>> list(ApiAnnouncementCommissionRatioListRequest request);
List<ApiAnnouncementCommissionRatioListResponse> conditionList(ApiAnnouncementCommissionRatioListRequest request);
Result batchSave(ApiAnnouncementCommissionRatioBatchSaveRequest request); Result batchSave(ApiAnnouncementCommissionRatioBatchSaveRequest request);
Result add(ApiAnnouncementCommissionRatioAddRequest request); Result add(ApiAnnouncementCommissionRatioAddRequest request);
......
...@@ -10,11 +10,9 @@ import com.yd.product.api.service.ApiAnnouncementCommissionRatioService; ...@@ -10,11 +10,9 @@ import com.yd.product.api.service.ApiAnnouncementCommissionRatioService;
import com.yd.product.api.service.ApiAnnouncementSpeciesService; import com.yd.product.api.service.ApiAnnouncementSpeciesService;
import com.yd.product.api.utils.ProductCommonUtils; import com.yd.product.api.utils.ProductCommonUtils;
import com.yd.product.feign.dto.ApiAnnouncementCommissionRatioBatchSaveDto; import com.yd.product.feign.dto.ApiAnnouncementCommissionRatioBatchSaveDto;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioBatchSaveRequest; import com.yd.product.feign.request.announcementcommissionratio.*;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioEditRequest;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioPageRequest;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioAddRequest;
import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioDetailResponse; import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioDetailResponse;
import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioListResponse;
import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioPageResponse; import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioPageResponse;
import com.yd.product.service.model.AnnouncementCommissionRatio; import com.yd.product.service.model.AnnouncementCommissionRatio;
import com.yd.product.service.model.AnnouncementSpecies; import com.yd.product.service.model.AnnouncementSpecies;
...@@ -55,6 +53,21 @@ public class ApiAnnouncementCommissionRatioServiceImpl implements ApiAnnouncemen ...@@ -55,6 +53,21 @@ public class ApiAnnouncementCommissionRatioServiceImpl implements ApiAnnouncemen
} }
/** /**
* 列表查询-条件查询-公告佣比率规格明细信息列表
* @param request
* @return
*/
@Override
public Result<List<ApiAnnouncementCommissionRatioListResponse>> list(ApiAnnouncementCommissionRatioListRequest request) {
return null;
}
@Override
public List<ApiAnnouncementCommissionRatioListResponse> conditionList(ApiAnnouncementCommissionRatioListRequest request) {
return iAnnouncementCommissionRatioService.conditionList(request);
}
/**
* 批量保存-公告佣比率规格明细信息 * 批量保存-公告佣比率规格明细信息
* @param request * @param request
* @return * @return
......
...@@ -2,16 +2,15 @@ package com.yd.product.feign.client.announcementcommissionratio; ...@@ -2,16 +2,15 @@ package com.yd.product.feign.client.announcementcommissionratio;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.product.feign.fallback.announcementcommissionratio.ApiAnnouncementCommissionRatioFeignFallbackFactory; import com.yd.product.feign.fallback.announcementcommissionratio.ApiAnnouncementCommissionRatioFeignFallbackFactory;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioBatchSaveRequest; import com.yd.product.feign.request.announcementcommissionratio.*;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioEditRequest;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioPageRequest;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioAddRequest;
import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioDetailResponse; import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioDetailResponse;
import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioListResponse;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.List;
/** /**
* 产品服务-公告佣比率规格明细信息Feign客户端 * 产品服务-公告佣比率规格明细信息Feign客户端
...@@ -28,6 +27,14 @@ public interface ApiAnnouncementCommissionRatioFeignClient { ...@@ -28,6 +27,14 @@ public interface ApiAnnouncementCommissionRatioFeignClient {
Result page(@RequestBody ApiAnnouncementCommissionRatioPageRequest request); Result page(@RequestBody ApiAnnouncementCommissionRatioPageRequest request);
/** /**
* 列表查询-条件查询-公告佣比率规格明细信息列表
* @param request
* @return
*/
@PostMapping("/list")
Result<List<ApiAnnouncementCommissionRatioListResponse>> list(@RequestBody ApiAnnouncementCommissionRatioListRequest request);
/**
* 批量保存-公告佣比率规格明细信息 * 批量保存-公告佣比率规格明细信息
* @param request * @param request
* @return * @return
......
...@@ -2,17 +2,16 @@ package com.yd.product.feign.fallback.announcementcommissionratio; ...@@ -2,17 +2,16 @@ package com.yd.product.feign.fallback.announcementcommissionratio;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.product.feign.client.announcementcommissionratio.ApiAnnouncementCommissionRatioFeignClient; import com.yd.product.feign.client.announcementcommissionratio.ApiAnnouncementCommissionRatioFeignClient;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioBatchSaveRequest; import com.yd.product.feign.request.announcementcommissionratio.*;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioEditRequest;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioPageRequest;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioAddRequest;
import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioDetailResponse; import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioDetailResponse;
import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioListResponse;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.List;
/** /**
* 产品服务-公告佣比率规格明细信息Feign降级处理 * 产品服务-公告佣比率规格明细信息Feign降级处理
...@@ -29,6 +28,11 @@ public class ApiAnnouncementCommissionRatioFeignFallbackFactory implements Fallb ...@@ -29,6 +28,11 @@ public class ApiAnnouncementCommissionRatioFeignFallbackFactory implements Fallb
} }
@Override @Override
public Result<List<ApiAnnouncementCommissionRatioListResponse>> list(ApiAnnouncementCommissionRatioListRequest request) {
return null;
}
@Override
public Result batchSave(ApiAnnouncementCommissionRatioBatchSaveRequest request) { public Result batchSave(ApiAnnouncementCommissionRatioBatchSaveRequest request) {
return null; return null;
} }
......
package com.yd.product.feign.request.announcementcommissionratio;
import lombok.Data;
import java.util.Date;
@Data
public class ApiAnnouncementCommissionRatioListRequest {
/**
* 生效日期
*/
private Date effectiveDate;
/**
* 供款年期(5、10、20年期等)
*/
private String paymentTerm;
/**
* 产品上架信息表唯一业务ID
*/
private String productLaunchBizId;
}
package com.yd.product.feign.response.announcementcommissionratio;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@Data
public class ApiAnnouncementCommissionRatioListResponse {
/**
* 产品上架信息表唯一业务ID
*/
private String productLaunchBizId;
/**
* 供款年期(5、10、20年期等)(固定规格条件)
*/
private String paymentTerm;
/**
* 公告佣比率规格明细表唯一业务ID
*/
private String announcementCommissionRatioBizId;
/**
* 公告佣比率规格表唯一业务ID
*/
private String announcementSpeciesBizId;
/**
* 佣金年限(起)
*/
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;
}
...@@ -2,12 +2,16 @@ package com.yd.product.service.dao; ...@@ -2,12 +2,16 @@ package com.yd.product.service.dao;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioListRequest;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioPageRequest; import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioPageRequest;
import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioListResponse;
import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioPageResponse; import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioPageResponse;
import com.yd.product.service.model.AnnouncementCommissionRatio; import com.yd.product.service.model.AnnouncementCommissionRatio;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* <p> * <p>
* 公告佣比率规格明细表 Mapper 接口 * 公告佣比率规格明细表 Mapper 接口
...@@ -20,4 +24,6 @@ public interface AnnouncementCommissionRatioMapper extends BaseMapper<Announceme ...@@ -20,4 +24,6 @@ public interface AnnouncementCommissionRatioMapper extends BaseMapper<Announceme
IPage<ApiAnnouncementCommissionRatioPageResponse> page(@Param("page") Page<ApiAnnouncementCommissionRatioPageResponse> page, IPage<ApiAnnouncementCommissionRatioPageResponse> page(@Param("page") Page<ApiAnnouncementCommissionRatioPageResponse> page,
@Param("request") ApiAnnouncementCommissionRatioPageRequest request); @Param("request") ApiAnnouncementCommissionRatioPageRequest request);
List<ApiAnnouncementCommissionRatioListResponse> conditionList(@Param("request") ApiAnnouncementCommissionRatioListRequest request);
} }
...@@ -2,7 +2,9 @@ package com.yd.product.service.service; ...@@ -2,7 +2,9 @@ package com.yd.product.service.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioListRequest;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioPageRequest; import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioPageRequest;
import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioListResponse;
import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioPageResponse; import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioPageResponse;
import com.yd.product.service.model.AnnouncementCommissionRatio; import com.yd.product.service.model.AnnouncementCommissionRatio;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
...@@ -22,6 +24,8 @@ public interface IAnnouncementCommissionRatioService extends IService<Announceme ...@@ -22,6 +24,8 @@ public interface IAnnouncementCommissionRatioService extends IService<Announceme
IPage<ApiAnnouncementCommissionRatioPageResponse> page(Page<ApiAnnouncementCommissionRatioPageResponse> page, IPage<ApiAnnouncementCommissionRatioPageResponse> page(Page<ApiAnnouncementCommissionRatioPageResponse> page,
ApiAnnouncementCommissionRatioPageRequest request); ApiAnnouncementCommissionRatioPageRequest request);
List<ApiAnnouncementCommissionRatioListResponse> conditionList(ApiAnnouncementCommissionRatioListRequest request);
AnnouncementCommissionRatio queryOne(String announcementCommissionRatioBizId); AnnouncementCommissionRatio queryOne(String announcementCommissionRatioBizId);
List<AnnouncementCommissionRatio> queryList(List<String> announcementSpeciesBizIdList); List<AnnouncementCommissionRatio> queryList(List<String> announcementSpeciesBizIdList);
......
...@@ -3,7 +3,9 @@ package com.yd.product.service.service.impl; ...@@ -3,7 +3,9 @@ package com.yd.product.service.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioListRequest;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioPageRequest; import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioPageRequest;
import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioListResponse;
import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioPageResponse; import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioPageResponse;
import com.yd.product.service.model.AnnouncementCommissionRatio; import com.yd.product.service.model.AnnouncementCommissionRatio;
import com.yd.product.service.dao.AnnouncementCommissionRatioMapper; import com.yd.product.service.dao.AnnouncementCommissionRatioMapper;
...@@ -32,6 +34,11 @@ public class AnnouncementCommissionRatioServiceImpl extends ServiceImpl<Announce ...@@ -32,6 +34,11 @@ public class AnnouncementCommissionRatioServiceImpl extends ServiceImpl<Announce
} }
@Override @Override
public List<ApiAnnouncementCommissionRatioListResponse> conditionList(ApiAnnouncementCommissionRatioListRequest request) {
return this.baseMapper.conditionList(request);
}
@Override
public AnnouncementCommissionRatio queryOne(String announcementCommissionRatioBizId) { public AnnouncementCommissionRatio queryOne(String announcementCommissionRatioBizId) {
return this.getOne(new LambdaQueryWrapper<AnnouncementCommissionRatio>().eq(AnnouncementCommissionRatio::getAnnouncementCommissionRatioBizId,announcementCommissionRatioBizId)); return this.getOne(new LambdaQueryWrapper<AnnouncementCommissionRatio>().eq(AnnouncementCommissionRatio::getAnnouncementCommissionRatioBizId,announcementCommissionRatioBizId));
} }
......
...@@ -13,4 +13,41 @@ ...@@ -13,4 +13,41 @@
and acr.is_deleted = 0 and acr.is_deleted = 0
</where> </where>
</select> </select>
<select id="conditionList" resultType="com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioListResponse">
SELECT
as1.product_launch_biz_id,
as1.payment_term,
acr.announcement_commission_ratio_biz_id,
acr.announcement_species_biz_id,
acr.start_period,
acr.end_period,
acr.discount_ratio,
acr.cardinal_number,
acr.commission_rate,
acr.effective_start,
acr.effective_end,
acr.scope,
acr.is_exchange_rate,
acr.currency
FROM announcement_commission_ratio acr
INNER JOIN announcement_species as1
ON acr.announcement_species_biz_id = as1.announcement_species_biz_id
<where>
as1.is_deleted = 0
AND as1.status = 1
AND acr.is_deleted = 0
AND acr.status = 1
<if test="request.productLaunchBizId != null and request.productLaunchBizId != ''">
AND as1.product_launch_biz_id = #{request.productLaunchBizId}
</if>
<if test="request.paymentTerm != null and request.paymentTerm != ''">
AND as1.payment_term = #{request.paymentTerm}
</if>
<if test="request.effectiveDate != null">
AND #{request.effectiveDate} BETWEEN acr.effective_start AND acr.effective_end
</if>
</where>
ORDER BY acr.effective_start DESC
</select>
</mapper> </mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment