autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-11 21:40:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Lemon
2023-07-07 11:44:36 +08:00
parent 923cc64892
commit 193fa58b2e
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
View File

@@ -156,7 +156,6 @@ public class OrderBasicInfoController extends BaseController {
@PreAuthorize("@ss.hasPermi('order:order:list')") @PreAuthorize("@ss.hasPermi('order:order:list')")
@PostMapping("/getMerchantOrderList") @PostMapping("/getMerchantOrderList")
public TableDataInfo getMerchantOrderList(@RequestBody QueryOrderDTO dto) { public TableDataInfo getMerchantOrderList(@RequestBody QueryOrderDTO dto) {
PageUtils.startPage();
return getDataTable(orderBasicInfoService.getMerchantOrderInfoList(dto)); return getDataTable(orderBasicInfoService.getMerchantOrderInfoList(dto));
} }
} }

4
jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java
View File

@@ -63,4 +63,8 @@ public class QueryOrderDTO extends BaseEntity {
* 结束时间 * 结束时间
*/ */
private String endTime; private String endTime;
private int pageSize;
private int pageNum;
} }

3
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -1987,11 +1987,14 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
*/ */
@Override @Override
public List<MerchantOrderInfoVO> getMerchantOrderInfoList(QueryOrderDTO dto) { public List<MerchantOrderInfoVO> getMerchantOrderInfoList(QueryOrderDTO dto) {
int pageNum = dto.getPageNum() == 0 ? 1 : dto.getPageNum();
int pageSize = dto.getPageSize() == 0 ? 10 : dto.getPageSize();
String startTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.addDays(new Date(), -7)); String startTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.addDays(new Date(), -7));
startTime = dto.getStartTime() == null ? startTime : dto.getStartTime(); startTime = dto.getStartTime() == null ? startTime : dto.getStartTime();
dto.setStartTime(startTime); dto.setStartTime(startTime);
PageUtils.startPage(pageNum, pageSize);
return orderBasicInfoMapper.getMerchantOrderInfoList(dto); return orderBasicInfoMapper.getMerchantOrderInfoList(dto);
} }
} }