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

Compare commits

base: zenghuapei:66e4a6c6fc3ff35beec181c2fc9b7a5b33bbc14d
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product
...
compare: zenghuapei:322d5aae1afeb663aa77800517c2f92cacaf9ec4
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product

3 Commits
66e4a6c6fc ... 322d5aae1a

Author SHA1 Message Date
tangqian 322d5aae1a Merge branch 'master' into feature/mall_product 2023-06-18 13:14:30 +08:00
tangqian 676b7c73a1 fix:app推广员只查询付款订单 2023-06-18 13:06:07 +08:00
tangqian 9c88d5c6e1 fix:推广员导出 2023-06-17 16:42:59 +08:00
1 changed files with 6 additions and 0 deletions
Show Stats Expand all files Collapse all files

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

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