sczx_group/sczx_order
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加订单查询时，逻辑删除的标记

Browse Source
This commit is contained in:
zhangli
2025-08-23 00:27:39 +08:00
parent 94577c2f34
commit 876e6e33d9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
View File

@ -337,8 +337,6 @@ public class OrderServiceImpl implements OrderService {
//获取门店信息 //获取门店信息
CompanyStoreDTO companyStoreDTO = storeInteg.getStoreById(Integer.valueOf(orderMainPO.getStoreId().toString())); CompanyStoreDTO companyStoreDTO = storeInteg.getStoreById(Integer.valueOf(orderMainPO.getStoreId().toString()));
CarModelSimpleDTO carModelSimpleDTO = carInteg.getCarModelByModelId(orderMainPO.getCarModelId());
RentCarRuleDTO rentCarRuleDTO = carInteg.getRentCarRuleByCarRuleId(orderMainPO.getRentCarRuleId()); RentCarRuleDTO rentCarRuleDTO = carInteg.getRentCarRuleByCarRuleId(orderMainPO.getRentCarRuleId());
SimpleUserInfoDTO userInfoDTO = jwtUtil.getUserInfoFromToken(); SimpleUserInfoDTO userInfoDTO = jwtUtil.getUserInfoFromToken();
OrderSubPO orderSubPO = orderSubPOList.get(0); OrderSubPO orderSubPO = orderSubPOList.get(0);
@ -629,6 +627,7 @@ public class OrderServiceImpl implements OrderService {
} }
LambdaQueryWrapper<OrderMainPO> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OrderMainPO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(OrderMainPO::getCustomerId, customerId) queryWrapper.eq(OrderMainPO::getCustomerId, customerId)
.eq(OrderMainPO::getDelFlag, "0")
.notIn(OrderMainPO::getOrderStatus, Arrays.asList(OrderStatusEnum.AUTO_END.getCode(), OrderStatusEnum.MANUAL_END.getCode())) .notIn(OrderMainPO::getOrderStatus, Arrays.asList(OrderStatusEnum.AUTO_END.getCode(), OrderStatusEnum.MANUAL_END.getCode()))
.orderByDesc(OrderMainPO::getOrderId).last(" limit 1"); .orderByDesc(OrderMainPO::getOrderId).last(" limit 1");
OrderMainPO orderMainPO = orderMainRepo.getOne(queryWrapper); OrderMainPO orderMainPO = orderMainRepo.getOne(queryWrapper);

3
src/main/resources/mapper/OrderMainMapper.xml
View File

@ -12,7 +12,7 @@
COUNT(CASE WHEN order_status = 'WAIT_RETURN' THEN 1 END) as pending_return_count, COUNT(CASE WHEN order_status = 'WAIT_RETURN' THEN 1 END) as pending_return_count,
COUNT(CASE WHEN order_status = 'RENT_OVERDUE' THEN 1 END) as overdue_count COUNT(CASE WHEN order_status = 'RENT_OVERDUE' THEN 1 END) as overdue_count
FROM zc_order_main FROM zc_order_main
WHERE store_id = #{storeId} WHERE store_id = #{storeId} and del_flag = '0'
GROUP BY store_id GROUP BY store_id
</select> </select>
@ -38,6 +38,7 @@
LEFT JOIN zc_car c on o.vehicle_id = c.id LEFT JOIN zc_car c on o.vehicle_id = c.id
<where> <where>
o.del_flag = '0'
<if test="customerId != null"> <if test="customerId != null">
and o.customer_id = #{customerId} and o.customer_id = #{customerId}
</if> </if>