diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index f07d0264..0ffa8b1b 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -1588,9 +1588,9 @@ public class OrderDetailController extends BaseController { // 拒单 - logger.info("师傅资料{}", masterWorker); + // logger.info("师傅资料{}", masterWorker); WorkerCertification workerRealInfo = workerCertificationService.selectByWorkerId(od.getWorkerId()); - logger.info("认证师傅资料{}", workerRealInfo); + // logger.info("认证师傅资料{}", workerRealInfo); try { // 推送公众号通知数据。 // 消息组装。 diff --git a/ghy-admin/src/main/resources/templates/order/orderManager.html b/ghy-admin/src/main/resources/templates/order/orderManager.html index e3d2b673..b99bbb56 100644 --- a/ghy-admin/src/main/resources/templates/order/orderManager.html +++ b/ghy-admin/src/main/resources/templates/order/orderManager.html @@ -975,12 +975,21 @@ } function orderMasterReject(id) { - $.modal.confirm("确定要退单吗?", function() { - const url = "console/cancel"; - const data = { "id": id }; - $.operate.post(url, data); + $.modal.confirm("确定要退单吗?", function() { + const url = "console/cancel"; + const data = { "id": id }; + $.ajax({ + type: "POST", + dataType: "json", + url: url, + data: JSON.stringify(data), + contentType: 'application/json', + success: function (result) { + $.operate.ajaxSuccess(result); + } }); - } + }); +} function changeConditionBtnChosenStyle(e) { $('.condition-btn .btn').removeClass('active-condition-btn'); diff --git a/ghy-admin/src/main/resources/templates/order/pc-master.html b/ghy-admin/src/main/resources/templates/order/pc-master.html index 03d2d4a9..89b81955 100644 --- a/ghy-admin/src/main/resources/templates/order/pc-master.html +++ b/ghy-admin/src/main/resources/templates/order/pc-master.html @@ -585,12 +585,21 @@ } function orderMasterReject(id) { - $.modal.confirm("确定要退单吗?", function() { - const url = "console/cancel"; - const data = { "id": id }; - $.operate.post(url, data); + $.modal.confirm("确定要退单吗?", function() { + const url = "console/cancel"; + const data = { "id": id }; + $.ajax({ + type: "POST", + dataType: "json", + url: url, + data: JSON.stringify(data), + contentType: 'application/json', + success: function (result) { + $.operate.ajaxSuccess(result); + } }); - } + }); +} function changeConditionBtnChosenStyle(e) { $('.condition-btn .btn').removeClass('active-condition-btn'); diff --git a/ghy-common/src/main/java/com/ghy/common/enums/WxStatusEnum.java b/ghy-common/src/main/java/com/ghy/common/enums/WxStatusEnum.java index 83f5e0e7..bdd11503 100644 --- a/ghy-common/src/main/java/com/ghy/common/enums/WxStatusEnum.java +++ b/ghy-common/src/main/java/com/ghy/common/enums/WxStatusEnum.java @@ -17,8 +17,8 @@ public enum WxStatusEnum { TEXT("", "dnjTqmqr7OsnOXJR_SikVNNQOPSZLJ6pcDoysOksjNQ"), NORMAL_ORDER("", "/pages/order-manage/order-manage"), - /** 拒单 **/ - REJECT_ORDER("", "lJUpyU7h6ipzjgBCdLW0vShjaG3uPxPZ4tQNwfv_XPM"), + /** 拒单 **/ + REJECT_ORDER("", "/pages/order-manage/order-manage"), /** 新工单 默认 **/ DEFAULT_ORDER("", "/pages/order-manage/order-manage?stateCur=6"), /**售后工单待处理提醒**/ diff --git a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java index 74932f07..a6002ea9 100644 --- a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java +++ b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java @@ -182,7 +182,7 @@ public class OrderServiceImpl implements OrderService { Date now = new Date(); // 待接单状态的超时逻辑 if (ZERO.equals(order.getOrderStatus())) { - log.info("单号:{},状态:{},创建时间:{},更新时间:{}", order.getCode(), order.getOrderStatus(), order.getCreateTime(), order.getUpdateTime()); + log.info("单号:{},状态:{},创建时间:{},更新时间:{}是否超时:{}", order.getCode(), order.getOrderStatus(), order.getCreateTime(), order.getUpdateTime(),order.getTimeout()); Date createTime = order.getCreateTime(); Date overTime30min = getOverTime(createTime, 30 * 60 * 1000); Date overTime1h = getOverTime(createTime, 30 * 60 * 1000); @@ -206,6 +206,7 @@ public class OrderServiceImpl implements OrderService { } // 是否已经超时 boolean timeout = ONE.equals(order.getTimeout()); + log.info("是否超时:{}超时时间为{}", timeout,overTime30min); if (!timeout) { if (overTime30min.before(now)) { // 30min未接单为超时