zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

pull/17/head
Jruome 2023-06-19 17:28:58 +08:00
parent 8b78cc917e 322d5aae1a
commit 5ae6e3481c
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
View File

@ -203,6 +203,8 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
@Override @Override
public List<RechargeOrderExcelVO> findListExcel(RechargeOrderExportReqVO data) { public List<RechargeOrderExcelVO> findListExcel(RechargeOrderExportReqVO data) {
Long tenantId = TenantContextHolder.getTenantId();
data.setTenantId(tenantId);
return rechargeOrderMapper.findListExcel(data); return rechargeOrderMapper.findListExcel(data);
} }
@ -244,6 +246,7 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
@Override @Override
public PageResult<RechargeOrderRespVO> promoterOrderInfo(RechargeOrderPageReqVO pageReqVO) { public PageResult<RechargeOrderRespVO> promoterOrderInfo(RechargeOrderPageReqVO pageReqVO) {
Page<RechargeOrderRespVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); Page<RechargeOrderRespVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
pageReqVO.setPaid("1");
rechargeOrderMapper.findListPage(page, pageReqVO); rechargeOrderMapper.findListPage(page, pageReqVO);
if (!CollectionUtils.isEmpty(page.getRecords())) { if (!CollectionUtils.isEmpty(page.getRecords())) {
List<String> collect1 = page.getRecords().stream().map(RechargeOrderBaseVO::getOrderId).collect(Collectors.toList()); List<String> collect1 = page.getRecords().stream().map(RechargeOrderBaseVO::getOrderId).collect(Collectors.toList());