autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-21 03:25:12 +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

69
jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMerchantOrderDTO.java Normal file
View File

@@ -0,0 +1,69 @@
package com.jsowell.pile.dto;
import lombok.Data;
/**
* 获取运营商订单列表dto
*
* @author Lemon
* @Date 2023/7/10 9:56
*/
@Data
public class QueryMerchantOrderDTO {
/**
* 充电桩编号
*/
private String pileSn;
/**
* 枪口号
*/
private String connectorCode;
/**
* 会员id
*/
private String memberId;
/**
* 订单状态
*/
private String orderStatus;
/**
* 订单编号
*/
private String orderCode;
// 交易流水号
private String transactionCode;
/**
* 手机号
*/
private String mobileNumber;
/**
* 站点Id
*/
private String stationId;
/**
* 运营商Id
*/
private String merchantId;
/**
* 开始时间
*/
private String startTime;
/**
* 结束时间
*/
private String endTime;
private int pageSize;
private int pageNum;
}

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

@@ -64,7 +64,7 @@ public class QueryOrderDTO extends BaseEntity {
*/
private String endTime;
private int pageSize;
private int pageNum;
// private int pageSize;
//
// private int pageNum;
}

7
jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java
View File

@@ -2,10 +2,7 @@ package com.jsowell.pile.mapper;
import com.jsowell.pile.domain.OrderBasicInfo;
import com.jsowell.pile.domain.OrderDetail;
import com.jsowell.pile.dto.IndexQueryDTO;
import com.jsowell.pile.dto.QueryOrderDTO;
import com.jsowell.pile.dto.QueryPersonPileDTO;
import com.jsowell.pile.dto.QueryStationInfoDTO;
import com.jsowell.pile.dto.*;
import com.jsowell.pile.vo.base.MerchantOrderInfoVO;
import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO;
import com.jsowell.pile.vo.uniapp.OrderVO;
@@ -217,5 +214,5 @@ public interface OrderBasicInfoMapper {
* @param dto
* @return
*/
List<MerchantOrderInfoVO> getMerchantOrderInfoList(@Param("dto") QueryOrderDTO dto);
List<MerchantOrderInfoVO> getMerchantOrderInfoList(@Param("dto") QueryMerchantOrderDTO dto);
}

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));