diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java index d3d4c76..56c8ec7 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java @@ -30,4 +30,6 @@ public interface OrderMapper { Integer updateOrderStatus(@Param("ids") List ids, @Param("orderStatus") String orderStatus,@Param("userName") String userName); Integer updateDevCount(OrderDetailDto orderDetailDto); + + List selectOrderDetailsByOderId(String orderId); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java index 7725069..42b85b7 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java @@ -91,9 +91,7 @@ public class OrderServiceImpl implements OrderService { @Override public OrderInfoDto getOrderDetailsById(OrderDetailDto dto) { OrderInfoDto orderInfoDto = orderMapper.getOrderDetailsById(dto); - List list = new ArrayList(); - OrderDetailDto orderDetailDto = orderMapper.selectOrderDetailsById(dto.getId().toString()); - list.add(orderDetailDto); + List list = orderMapper.selectOrderDetailsByOderId(dto.getOrderId().toString()); orderInfoDto.setDetailsList(list); return orderInfoDto; } diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml index d43992c..d6c7eeb 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml @@ -73,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mdi.person_phone AS personPhone, su.phonenumber AS phoneNumber, moi.address, + moi.order_id, sum(hh.costs) cost, dept.companyName FROM @@ -173,6 +174,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN sys_dept sd1 ON sd1.parent_id = subquery.first_ancestor ) dept ON dept.deptId = su.dept_id WHERE - mt.del_flag = '0' and hh.id = #{id} + mt.del_flag = '0' and moi.order_id = #{orderId} limit 1 + + \ No newline at end of file