diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index cdbd89dca..db75c4d69 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -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 orderPeriodAmountVOS = transformPeriodAmountByOrderDetail(orderDetail); + vo.setChargeDetails(orderPeriodAmountVOS); if (orderVO == null) { return vo; } - // 查询该站点正在使用的计费模板 - List priceList = pileBillingTemplateService.queryBillingPrice(orderVO.getStationId()); - if (CollectionUtils.isNotEmpty(priceList)) { - vo.setPriceList(priceList); - } + // // 查询该站点正在使用的计费模板 + // List 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 payRecords = orderPayRecordService.selectOrderPayInfoList(orderCode); + List payRecordList = orderPayRecordService.selectOrderPayRecordList(orderCode); + + vo.setPayRecordList(payRecordList); + + // 查询退款明细 + List orderRefundInfoList = getOrderRefundInfoList(orderCode); + vo.setRefundInfoList(orderRefundInfoList); + + // 用户信息 + MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(orderVO.getMemberId()); + vo.setMemberVO(memberVO); + return vo; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/business/BusinessOrderDetailInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/business/BusinessOrderDetailInfoVO.java index fb457d09d..4808f4ad3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/business/BusinessOrderDetailInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/business/BusinessOrderDetailInfoVO.java @@ -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 priceList; + /** + * 充电实时数据信息 + */ private List pileMonitorDataList; + + /** + * 各时段充电计费详情 + */ + private List chargeDetails; + + /** + * 会员信息 + */ + private MemberVO memberVO; + + /** + * 支付记录信息 + */ + private List payRecordList; + + /** + * 退款信息 + */ + private List refundInfoList; }