diff --git a/api-third/src/main/java/com/heyu/api/service/impl/VvTradeOrderConvertServiceImpl.java b/api-third/src/main/java/com/heyu/api/service/impl/VvTradeOrderConvertServiceImpl.java index 7bb718b..e627cda 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/VvTradeOrderConvertServiceImpl.java +++ b/api-third/src/main/java/com/heyu/api/service/impl/VvTradeOrderConvertServiceImpl.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; @Service -public class VvTradeOrderConvertServiceImpl extends VvTradeOrderConvertService { +public class VvTradeOrderConvertServiceImpl implements VvTradeOrderConvertService { @Autowired 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 d1853ee..c6a5cb7 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 @@ -139,16 +139,16 @@ public class AdminOrderController { /*** * 订单详情 + * + * /mm/order/detail + * */ @RequestMapping("/detail") public R detail(@RequestBody VVOrderDetailRequest request) { - VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderDao .selectVvTradeOrderById(request.getTradeOrderId()); - + VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderDao.selectVvTradeOrderById(request.getTradeOrderId()); List vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderId(request.getTradeOrderId()); - List vvTradeOrderEntities = SanUtils.asList(vvTradeOrderEntity); - - List vvOrderListResps = vvTradeOrderConvertService.convertTradeOrderLineResp(vvTradeOrderEntities,vvTradeOrderLineEntityList); + List vvOrderListResps = vvTradeOrderConvertService.convertTradeOrderLineResp(vvTradeOrderEntities, vvTradeOrderLineEntityList); VVOrderDetailResp vvOrderDetailResp = new VVOrderDetailResp(); vvOrderDetailResp.setVvTradeOrderEntity(vvTradeOrderEntity); @@ -161,7 +161,6 @@ public class AdminOrderController { } - /*** * 订单发货 */