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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
YAS\29473
2026-01-29 14:34:39 +08:00
parent 6404ca3d22 5ffb8826f5
commit e5bd11bd13
12 changed files with 509 additions and 15 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;
}