diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VVOrderDetailResp.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VVOrderDetailResp.java index 344fbdf..d44e51d 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VVOrderDetailResp.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VVOrderDetailResp.java @@ -1,37 +1,24 @@ package com.heyu.api.alibaba.request.mm.order.resp; -import com.heyu.api.data.entity.vv.VvBuyerAddressEntity; import com.heyu.api.data.entity.vv.VvBuyerEntity; -import com.heyu.api.data.entity.vv.VvTradeOrderEntity; import lombok.Data; -import java.util.List; - @Data public class VVOrderDetailResp { - /*** - * 订单信息 - */ - private VvTradeOrderEntity vvTradeOrderEntity; - /*** * 订单行信息 */ - private List vvTradeOrderLineEntityList; - + private VVOrderListResp vvTradeOrderResp; /*** * 订单信息 */ private VvBuyerEntity vvBuyerEntity; - - - } diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java index e915fbf..b232e42 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java @@ -177,17 +177,19 @@ public class AdminOrderController { @RequestMapping("/detail") public R detail(@RequestBody VVOrderDetailRequest request) { VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderDao.selectVvTradeOrderById(request.getTradeOrderId()); + List vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderId(request.getTradeOrderId()); List vvTradeOrderEntities = SanUtils.asList(vvTradeOrderEntity); - List vvOrderListResps = vvTradeOrderConvertService.convertTradeOrderLineResp(vvTradeOrderEntities, vvTradeOrderLineEntityList,false); + List vvOrderListResps = vvTradeOrderConvertService.convertTradeOrderLineResp(vvTradeOrderEntities, vvTradeOrderLineEntityList, false); VVOrderDetailResp vvOrderDetailResp = new VVOrderDetailResp(); - vvOrderDetailResp.setVvTradeOrderEntity(vvTradeOrderEntity); - vvOrderDetailResp.setVvTradeOrderLineEntityList(vvOrderListResps); + vvOrderDetailResp.setVvTradeOrderResp(vvOrderListResps.get(0)); + VvBuyerEntity vvBuyerEntity = vvBuyerDao.selectVvBuyerById(vvTradeOrderEntity.getBuyerId()); + vvOrderDetailResp.setVvBuyerEntity(vvBuyerEntity); return R.ok().setData(vvOrderDetailResp);