bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单状态统一修改

This commit is contained in:
liang.chao 2024-12-01 12:28:14 +08:00
parent 586aa21b41
commit c0960719db
3 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java
View File

@ -30,4 +30,6 @@ public interface OrderMapper {
Integer updateOrderStatus(@Param("ids") List<Integer> ids, @Param("orderStatus") String orderStatus,@Param("userName") String userName);
Integer updateDevCount(OrderDetailDto orderDetailDto);
List<OrderDetailDto> selectOrderDetailsByOderId(String orderId);
}

4
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java
View File

@ -91,9 +91,7 @@ public class OrderServiceImpl implements OrderService {
@Override
public OrderInfoDto getOrderDetailsById(OrderDetailDto dto) {
OrderInfoDto orderInfoDto = orderMapper.getOrderDetailsById(dto);
List<OrderDetailDto> list = new ArrayList();
OrderDetailDto orderDetailDto = orderMapper.selectOrderDetailsById(dto.getId().toString());
list.add(orderDetailDto);
List<OrderDetailDto> list = orderMapper.selectOrderDetailsByOderId(dto.getOrderId().toString());
orderInfoDto.setDetailsList(list);
return orderInfoDto;
}

30
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
View File

@ -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
</select>
<select id="selectOrderDetailsByOderId" resultType="com.bonus.material.order.domain.OrderDetailDto">
SELECT
mdi.device_name,
mdi.day_lease_price,
hh.order_status,
hh.days,
bfi.url,
hh.id,
hh.num,
hh.costs,
hh.rent_begin_time,
hh.rent_end_time,
hh.pre_outbound_user,
hh.pre_outbound_time,
hh.take_over_user,
hh.take_over_time,
hh.rent_over_user,
hh.rent_over_time
FROM
ma_order_details hh
LEFT JOIN ma_order_info moi ON hh.order_id = moi.order_id
LEFT JOIN ma_dev_info mdi ON hh.ma_id = mdi.ma_id
LEFT JOIN bm_file_info bfi ON hh.ma_id = bfi.model_id
AND bfi.file_type = 0
WHERE
moi.order_id = #{orderId}
</select>
</mapper>