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

整合OrderBasicInfo和OrderDetail

Browse Source
This commit is contained in:
Guoqs
2025-01-15 09:48:10 +08:00
parent 37e1ac9ed8
commit c6a23b96ad
2 changed files with 397 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,6 +51,7 @@ import com.jsowell.pile.transaction.dto.ClearingBillTransactionDTO;
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.SupStationStatsVO;
import com.jsowell.pile.vo.base.MerchantOrderInfoVO;
import com.jsowell.pile.vo.base.OrderAmountDetailVO;
@@ -437,6 +438,80 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
return resultVO;
}
/**
* 整合OrderBasicInfo和OrderDetail
*/
public OrderInfoDetailVO getOrderInfoDetailVO(OrderBasicInfo orderBasicInfo, OrderDetail orderDetail) {
if (orderBasicInfo == null || orderDetail == null) {
return null;
}
OrderInfoDetailVO orderInfoDetailVO = new OrderInfoDetailVO();
orderInfoDetailVO.setOrderCode(orderBasicInfo.getOrderCode());
orderInfoDetailVO.setTransactionCode(orderBasicInfo.getTransactionCode());
orderInfoDetailVO.setOrderStatus(orderBasicInfo.getOrderStatus());
orderInfoDetailVO.setMemberId(orderBasicInfo.getMemberId());
orderInfoDetailVO.setStationId(orderBasicInfo.getStationId());
orderInfoDetailVO.setMerchantId(orderBasicInfo.getMerchantId());
orderInfoDetailVO.setPileSn(orderBasicInfo.getPileSn());
orderInfoDetailVO.setConnectorCode(orderBasicInfo.getConnectorCode());
orderInfoDetailVO.setPileConnectorCode(orderBasicInfo.getPileConnectorCode());
orderInfoDetailVO.setLogicCard(orderBasicInfo.getLogicCard());
orderInfoDetailVO.setVinCode(orderBasicInfo.getVinCode());
orderInfoDetailVO.setStartMode(orderBasicInfo.getStartMode());
orderInfoDetailVO.setThirdPartyType(orderBasicInfo.getThirdPartyType());
orderInfoDetailVO.setPayMode(orderBasicInfo.getPayMode());
orderInfoDetailVO.setPayStatus(orderBasicInfo.getPayStatus());
orderInfoDetailVO.setPayAmount(orderBasicInfo.getPayAmount());
orderInfoDetailVO.setPayTime(orderBasicInfo.getPayTime());
orderInfoDetailVO.setPlateNumber(orderBasicInfo.getPlateNumber());
orderInfoDetailVO.setOrderAmount(orderBasicInfo.getOrderAmount());
orderInfoDetailVO.setVirtualAmount(orderBasicInfo.getVirtualAmount());
orderInfoDetailVO.setGroupCode(orderBasicInfo.getGroupCode());
orderInfoDetailVO.setDiscountAmount(orderBasicInfo.getDiscountAmount());
orderInfoDetailVO.setSettleAmount(orderBasicInfo.getSettleAmount());
orderInfoDetailVO.setRemedialAmount(orderBasicInfo.getRemedialAmount());
orderInfoDetailVO.setChargeStartTime(orderBasicInfo.getChargeStartTime());
orderInfoDetailVO.setChargeEndTime(orderBasicInfo.getChargeEndTime());
orderInfoDetailVO.setStartType(orderBasicInfo.getStartType());
orderInfoDetailVO.setReservedStartTime(orderBasicInfo.getReservedStartTime());
orderInfoDetailVO.setReservedEndTime(orderBasicInfo.getReservedEndTime());
orderInfoDetailVO.setStartSoc(orderBasicInfo.getStartSoc());
orderInfoDetailVO.setEndSoc(orderBasicInfo.getEndSoc());
orderInfoDetailVO.setStopReasonCode(orderBasicInfo.getStopReasonCode());
orderInfoDetailVO.setReason(orderBasicInfo.getReason());
orderInfoDetailVO.setSettlementTime(orderBasicInfo.getSettlementTime());
orderInfoDetailVO.setRefundAmount(orderBasicInfo.getRefundAmount());
orderInfoDetailVO.setRefundStatus(orderBasicInfo.getRefundStatus());
orderInfoDetailVO.setTotalUsedElectricity(orderDetail.getTotalUsedElectricity());
orderInfoDetailVO.setTotalOrderAmount(orderDetail.getTotalOrderAmount());
orderInfoDetailVO.setTotalElectricityAmount(orderDetail.getTotalElectricityAmount());
orderInfoDetailVO.setDiscountElectricityAmount(orderDetail.getDiscountElectricityAmount());
orderInfoDetailVO.setTotalServiceAmount(orderDetail.getTotalServiceAmount());
orderInfoDetailVO.setDiscountServiceAmount(orderDetail.getDiscountServiceAmount());
orderInfoDetailVO.setSharpPrice(orderDetail.getSharpPrice());
orderInfoDetailVO.setSharpUsedElectricity(orderDetail.getSharpUsedElectricity());
orderInfoDetailVO.setSharpElectricityPrice(orderDetail.getSharpElectricityPrice());
orderInfoDetailVO.setSharpServicePrice(orderDetail.getSharpServicePrice());
orderInfoDetailVO.setSharpAmount(orderDetail.getSharpAmount());
orderInfoDetailVO.setPeakPrice(orderDetail.getPeakPrice());
orderInfoDetailVO.setPeakUsedElectricity(orderDetail.getPeakUsedElectricity());
orderInfoDetailVO.setPeakElectricityPrice(orderDetail.getPeakElectricityPrice());
orderInfoDetailVO.setPeakServicePrice(orderDetail.getPeakServicePrice());
orderInfoDetailVO.setPeakAmount(orderDetail.getPeakAmount());
orderInfoDetailVO.setFlatPrice(orderDetail.getFlatPrice());
orderInfoDetailVO.setFlatUsedElectricity(orderDetail.getFlatUsedElectricity());
orderInfoDetailVO.setFlatElectricityPrice(orderDetail.getFlatElectricityPrice());
orderInfoDetailVO.setFlatServicePrice(orderDetail.getFlatServicePrice());
orderInfoDetailVO.setFlatAmount(orderDetail.getFlatAmount());
orderInfoDetailVO.setValleyPrice(orderDetail.getValleyPrice());
orderInfoDetailVO.setValleyUsedElectricity(orderDetail.getValleyUsedElectricity());
orderInfoDetailVO.setValleyElectricityPrice(orderDetail.getValleyElectricityPrice());
orderInfoDetailVO.setValleyServicePrice(orderDetail.getValleyServicePrice());
orderInfoDetailVO.setValleyAmount(orderDetail.getValleyAmount());
return orderInfoDetailVO;
}
/**
* 查询时间段内订单总金额和总用电量V2
*