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

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-07-10 10:08:50 +08:00
parent 5f9586e7e2 2b55492856
commit d8560bd998
6 changed files with 78 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java
View File

@@ -277,7 +277,7 @@ public interface IOrderBasicInfoService {
* 获取运营商订单列表
* @return
*/
List<MerchantOrderInfoVO> getMerchantOrderInfoList(QueryOrderDTO dto);
List<MerchantOrderInfoVO> getMerchantOrderInfoList(QueryMerchantOrderDTO dto);
/**
* 生成订单逻辑

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

@@ -2064,7 +2064,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
* @return
*/
@Override
public List<MerchantOrderInfoVO> getMerchantOrderInfoList(QueryOrderDTO dto) {
public List<MerchantOrderInfoVO> getMerchantOrderInfoList(QueryMerchantOrderDTO 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));