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-07-14 17:33:50 +08:00
parent f1d55564c3
commit 08c7cb32a9
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -460,6 +460,7 @@ public class OrderController extends BaseController {
od.setRevTime(om.getRevTime()); od.setRevTime(om.getRevTime());
od.setExpectTimeStart(om.getExpectTimeStart()); od.setExpectTimeStart(om.getExpectTimeStart());
od.setExpectTimeEnd(om.getExpectTimeEnd()); od.setExpectTimeEnd(om.getExpectTimeEnd());
od.setWorkBeginTime(new Date());
orderDetailService.insertOrderDetail(od); orderDetailService.insertOrderDetail(od);
logger.info("子订单是否创建完成{}", od); logger.info("子订单是否创建完成{}", od);
// 批量生成订单商品 // 批量生成订单商品

6
ghy-common/src/main/java/com/ghy/common/enums/OrderBehaviorEnum.java
View File

@ -23,7 +23,11 @@ public enum OrderBehaviorEnum {
/** /**
* 派单 * 派单
*/ */
ASSIGN_ORDER("ASSIGN_ORDER", "派单"); ASSIGN_ORDER("ASSIGN_ORDER", "派单"),
/**
* 拒绝验收
*/
REJECT_ACCEPTANCE("REJECT_ACCEPTANCE", "拒绝验收");
public final String code; public final String code;
public final String desc; public final String desc;

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

@ -1456,7 +1456,8 @@ public class OrderServiceImpl implements OrderService {
// 检查是否到达目标时间 // 检查是否到达目标时间
if (now.after(targetTime)) { if (now.after(targetTime)) {
log.info("订单[{}]确认截止时间已到，开始转为确认中状态", orderDetail.getCode()); log.info("订单[{}]确认截止时间已到，开始转为确认中状态", orderDetail.getCode());
orderDetail.setWorkFinishTime(new Date());
orderDetailService.updateOrderDetail(orderDetail);
// 更新订单状态为确认中 // 更新订单状态为确认中
int result = orderDetailService.updateStatus(orderDetail.getId(), OrderStatus.FINISH_CHECK.code()); int result = orderDetailService.updateStatus(orderDetail.getId(), OrderStatus.FINISH_CHECK.code());