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

update 运营端小程序查询订单详情接口补充反参

Browse Source
This commit is contained in:
Lemon
2026-01-29 11:11:58 +08:00
parent a53c7619c3
commit 5ffb8826f5
2 changed files with 69 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,6 +56,7 @@ import com.jsowell.pile.transaction.dto.OrderTransactionDTO;
import com.jsowell.pile.transaction.service.TransactionService;
import com.jsowell.pile.util.UserUtils;
import com.jsowell.pile.vo.OrderInfoDetailVO;
import com.jsowell.pile.vo.OrderPayRecordVO;
import com.jsowell.pile.vo.SupStationStatsVO;
import com.jsowell.pile.vo.base.*;
import com.jsowell.pile.vo.base.PileInfoVO;
@@ -5721,14 +5722,19 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
public BusinessOrderDetailInfoVO getBusinessOrderDetail(String orderCode) {
BusinessOrderDetailInfoVO vo = new BusinessOrderDetailInfoVO();
OrderVO orderVO = getChargeOrderInfoByOrderCode(orderCode);
// 查询各时段详细费用
OrderDetail orderDetail = getOrderDetailByOrderCode(orderCode);
List<OrderPeriodAmountVO> orderPeriodAmountVOS = transformPeriodAmountByOrderDetail(orderDetail);
vo.setChargeDetails(orderPeriodAmountVOS);
if (orderVO == null) {
return vo;
}
// 查询该站点正在使用的计费模板
List<BillingPriceVO> priceList = pileBillingTemplateService.queryBillingPrice(orderVO.getStationId());
if (CollectionUtils.isNotEmpty(priceList)) {
vo.setPriceList(priceList);
}
// // 查询该站点正在使用的计费模板
// List<BillingPriceVO> priceList = pileBillingTemplateService.queryBillingPrice(orderVO.getStationId());
// if (CollectionUtils.isNotEmpty(priceList)) {
// vo.setPriceList(priceList);
// }
vo.setOrderStatus(orderVO.getOrderStatus());
vo.setCreateTime(orderVO.getCreateTime());
vo.setStartChargeTime(orderVO.getStartTime());
@@ -5800,6 +5806,20 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
vo.setPileMonitorDataList(infoList);
}
// 支付流水对应页面支付信息
// List<OrderDetailInfoVO.PayRecord> payRecords = orderPayRecordService.selectOrderPayInfoList(orderCode);
List<OrderPayRecordVO> payRecordList = orderPayRecordService.selectOrderPayRecordList(orderCode);
vo.setPayRecordList(payRecordList);
// 查询退款明细
List<OrderDetailInfoVO.OrderRefundInfo> orderRefundInfoList = getOrderRefundInfoList(orderCode);
vo.setRefundInfoList(orderRefundInfoList);
// 用户信息
MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(orderVO.getMemberId());
vo.setMemberVO(memberVO);
return vo;
}

44
jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/business/BusinessOrderDetailInfoVO.java
View File

@@ -1,6 +1,9 @@
package com.jsowell.pile.vo.uniapp.business;
import com.jsowell.pile.vo.OrderPayRecordVO;
import com.jsowell.pile.vo.base.OrderPeriodAmountVO;
import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO;
import com.jsowell.pile.vo.uniapp.customer.MemberVO;
import com.jsowell.pile.vo.web.OrderDetailInfoVO;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -233,17 +236,58 @@ public class BusinessOrderDetailInfoVO {
*/
private String vinCode;
/**
* 订单金额
*/
private BigDecimal orderAmount;
/**
* 折扣金额
*/
private BigDecimal discountAmount;
/**
* 手机号码
*/
private String phoneNumber;
/**
* 订单状态
*/
private String orderStatus;
/**
* 充电卡号
*/
private String cardNumber;
/**
* 计费模板
*/
private List<BillingPriceVO> priceList;
/**
* 充电实时数据信息
*/
private List<OrderDetailInfoVO.PileMonitorData> pileMonitorDataList;
/**
* 各时段充电计费详情
*/
private List<OrderPeriodAmountVO> chargeDetails;
/**
* 会员信息
*/
private MemberVO memberVO;
/**
* 支付记录信息
*/
private List<OrderPayRecordVO> payRecordList;
/**
* 退款信息
*/
private List<OrderDetailInfoVO.OrderRefundInfo> refundInfoList;
}