diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java index b9d036e37..5792b6148 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java @@ -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 getOrderTotalDataV2(QueryOrderDTO dto); /** 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 5f5326df3..635b1ebad 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 @@ -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;