|
|
@@ -305,17 +305,32 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
* 3. 将完整数据设置回分页对象并返回
|
|
|
* </p>
|
|
|
*
|
|
|
- * @param receivableQueryVo 列表查询条件,包含订单号、保险公司ID、结算状态、时间范围等筛选条件,以及分页参数
|
|
|
+ * @param vo 列表查询条件,包含订单号、保险公司ID、结算状态、时间范围等筛选条件,以及分页参数
|
|
|
* @return Page<InsPlyIncome> 返回分页后的应收订单列表,包含完整的订单信息及关联数据
|
|
|
*/
|
|
|
@Override
|
|
|
- public Page<InsPlyIncome> getReceivablePage(ReceivableQueryVo receivableQueryVo) {
|
|
|
- log.info("获取私有协议手续费应收列表。receivableQueryVo=[{}]", JSONUtil.toJsonStr(receivableQueryVo));
|
|
|
- Page<InsPlyIncome> page = baseMapper.getReceivablePage(receivableQueryVo.getPage(), receivableQueryVo);
|
|
|
+ public Page<InsPlyIncome> getReceivablePage(ReceivableQueryVo vo) {
|
|
|
+ log.info("获取私有协议手续费应收列表。vo=[{}]", JSONUtil.toJsonStr(vo));
|
|
|
+
|
|
|
+ // 完善支付时间的查询条件
|
|
|
+ if(StrUtil.isNotEmpty(vo.getPayTimeBegin())){
|
|
|
+ vo.setPayTimeBegin(DateTimeUtils.obtainStartTime(vo.getPayTimeBegin()));
|
|
|
+ }
|
|
|
+ if(StrUtil.isNotEmpty(vo.getPayTimeEnd())){
|
|
|
+ vo.setPayTimeEnd(DateTimeUtils.obtainNextDayStartTime(vo.getPayTimeEnd()));
|
|
|
+ }
|
|
|
+ if(StrUtil.isNotEmpty(vo.getSigningTimeStart())){
|
|
|
+ vo.setSigningTimeStart(DateTimeUtils.obtainStartTime(vo.getSigningTimeStart()));
|
|
|
+ }
|
|
|
+ if(StrUtil.isNotEmpty(vo.getSigningTimeEnd())){
|
|
|
+ vo.setSigningTimeEnd(DateTimeUtils.obtainNextDayStartTime(vo.getSigningTimeEnd()));
|
|
|
+ }
|
|
|
+
|
|
|
+ Page<InsPlyIncome> page = baseMapper.getReceivablePage(vo.getPage(), vo);
|
|
|
List<InsPlyIncome> records = page.getRecords();
|
|
|
records = records.stream().filter(action->{
|
|
|
// add by lipf 2026年7月3日09:55:17 只有私有的非车,才需要走下面的逻辑。 将非车保费为0的记录不显示
|
|
|
- if(StrUtil.isEmpty(receivableQueryVo.getQueryType()) || !"3".equals(receivableQueryVo.getQueryType())){
|
|
|
+ if(StrUtil.isEmpty(vo.getQueryType()) || !"3".equals(vo.getQueryType())){
|
|
|
return true;
|
|
|
}
|
|
|
if(StrUtil.isEmpty(action.getJyPremium())){
|
|
|
@@ -324,7 +339,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
BigDecimal JyPremium = new BigDecimal(action.getJyPremium());
|
|
|
return BigDecimal.ZERO.compareTo(JyPremium) != 0;
|
|
|
}).toList();
|
|
|
- records = this.fillOtherInfo(records,receivableQueryVo.getInvoiceType());
|
|
|
+ records = this.fillOtherInfo(records,vo.getInvoiceType());
|
|
|
page.setRecords(records);
|
|
|
return page;
|
|
|
}
|