|
|
|
@@ -156,6 +156,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageInfo<WxMerchantTradeDailyVo> listAsPageVo(WxMerchantTradeDaily record, Integer pageIndex, Integer pageSize) { |
|
|
|
handleQueryParam(record); |
|
|
|
PageInfo<WxMerchantTradeDaily> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantTradeDailyMapper.findList(record)); |
|
|
|
PageInfo<WxMerchantTradeDailyVo> retPageInfo = new PageInfo<WxMerchantTradeDailyVo>(); |
|
|
|
retPageInfo.setPageNum(pageIndex); |
|
|
|
@@ -166,6 +167,20 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ |
|
|
|
return retPageInfo; |
|
|
|
} |
|
|
|
|
|
|
|
private void handleQueryParam(WxMerchantTradeDaily record) { |
|
|
|
if (!StringUtils.isBlank(record.getMerchantName())) { |
|
|
|
WxMerchant m = new WxMerchant(); |
|
|
|
m.updateTenantInfo(record); |
|
|
|
m.setName(StringUtils.trimToNull(record.getMerchantName())); |
|
|
|
List<Long> merchantIdList = wxMerchantService.findIdList(m); |
|
|
|
if (null != merchantIdList && merchantIdList.size() > 0 ) { |
|
|
|
record.setMerchantIdList(merchantIdList); |
|
|
|
}else { |
|
|
|
record.setId(-999L); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
private List<WxMerchantTradeDailyVo> toVoList(List<WxMerchantTradeDaily> list,TenantEntity tenantEntity) { |
|
|
|
if (null == list || list.size() <= 0 ){ |
|
|
|
return null; |
|
|
|
|