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

整合OrderBasicInfo和OrderDetail

Browse Source
This commit is contained in:
Guoqs
2025-01-15 09:52:23 +08:00
parent c6a23b96ad
commit d64a8d00a4
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
View File

@@ -10,6 +10,7 @@ import com.jsowell.pile.domain.*;
import com.jsowell.pile.dto.*;
import com.jsowell.pile.dto.nanrui.NRQueryOrderDTO;
import com.jsowell.pile.dto.ningxiajiaotou.NXJTQueryOrdersInfoDTO;
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;
@@ -280,6 +281,10 @@ public interface OrderBasicInfoService{
*/
OrderTotalDataVO getOrderTotalData(QueryOrderDTO orderBasicInfo);
OrderInfoDetailVO getOrderInfoDetailVO(String orderCode);
OrderInfoDetailVO getOrderInfoDetailVO(OrderBasicInfo orderBasicInfo, OrderDetail orderDetail);
List<OrderTotalDataVO> getOrderTotalDataV2(QueryOrderDTO dto);
/**

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

@@ -438,9 +438,17 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
return resultVO;
}
@Override
public OrderInfoDetailVO getOrderInfoDetailVO(String orderCode) {
OrderBasicInfo orderInfoByOrderCode = getOrderInfoByOrderCode(orderCode);
OrderDetail orderDetail = getOrderDetailByOrderCode(orderCode);
return getOrderInfoDetailVO(orderInfoByOrderCode, orderDetail);
}
/**
* 整合OrderBasicInfo和OrderDetail
*/
@Override
public OrderInfoDetailVO getOrderInfoDetailVO(OrderBasicInfo orderBasicInfo, OrderDetail orderDetail) {
if (orderBasicInfo == null || orderDetail == null) {
return null;