clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

no message

This commit is contained in:
cb 2025-05-06 15:06:10 +08:00
parent ec4fdda392
commit 3c958a2923
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
View File

@ -96,7 +96,8 @@
city_name , city_name ,
country_name , country_name ,
street_name , street_name ,
phone phone,
has_dispatched_all
FROM order_master FROM order_master
</sql> </sql>
@ -143,7 +144,8 @@
om.city_name , om.city_name ,
om.country_name , om.country_name ,
om.street_name , om.street_name ,
om.phone om.phone,
om.has_dispatched_all
FROM order_master om FROM order_master om
LEFT JOIN customer_address ca ON ca.customer_address_id = om.address_id LEFT JOIN customer_address ca ON ca.customer_address_id = om.address_id
LEFT JOIN goods g ON g.goods_id = om.goods_id LEFT JOIN goods g ON g.goods_id = om.goods_id

2
ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
View File

@ -224,7 +224,7 @@ public class OrderServiceImpl implements OrderService {
log.info("主订单是否未约未排[{}]派单工id{}", order.getIsCall(),order.getWorkerId()); log.info("主订单是否未约未排[{}]派单工id{}", order.getIsCall(),order.getWorkerId());
if (overTime30min.before(now)) { if (overTime30min.before(now)) {
// 30min未接单为超时 // 30min未接单为超时
log.info("主订单[{}]超时30分钟", order.getId()); log.info("主订单[{}]超时30分钟未排的参数{}", order.getId(),order.getHasDispatchedAll());
orderMasterService.updateTimeout(order.getId(), 1); orderMasterService.updateTimeout(order.getId(), 1);
timeout = true; timeout = true;
//主单超时未约未排 //主单超时未约未排