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-11-14 16:34:00 +08:00
parent f88d3a1673
commit 027e23e538
5 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
View File

@ -1588,9 +1588,9 @@ public class OrderDetailController extends BaseController {
// 拒单 // 拒单
logger.info("师傅资料{}", masterWorker); // logger.info("师傅资料{}", masterWorker);
WorkerCertification workerRealInfo = workerCertificationService.selectByWorkerId(od.getWorkerId()); WorkerCertification workerRealInfo = workerCertificationService.selectByWorkerId(od.getWorkerId());
logger.info("认证师傅资料{}", workerRealInfo); // logger.info("认证师傅资料{}", workerRealInfo);
try { try {
// 推送公众号通知数据。 // 推送公众号通知数据。
// 消息组装。 // 消息组装。

19
ghy-admin/src/main/resources/templates/order/orderManager.html
View File

@ -975,12 +975,21 @@
} }
function orderMasterReject(id) { function orderMasterReject(id) {
$.modal.confirm("确定要退单吗？", function() { $.modal.confirm("确定要退单吗？", function() {
const url = "console/cancel"; const url = "console/cancel";
const data = { "id": id }; const data = { "id": id };
$.operate.post(url, data); $.ajax({
type: "POST",
dataType: "json",
url: url,
data: JSON.stringify(data),
contentType: 'application/json',
success: function (result) {
$.operate.ajaxSuccess(result);
}
}); });
} });
}
function changeConditionBtnChosenStyle(e) { function changeConditionBtnChosenStyle(e) {
$('.condition-btn .btn').removeClass('active-condition-btn'); $('.condition-btn .btn').removeClass('active-condition-btn');

19
ghy-admin/src/main/resources/templates/order/pc-master.html
View File

@ -585,12 +585,21 @@
} }
function orderMasterReject(id) { function orderMasterReject(id) {
$.modal.confirm("确定要退单吗？", function() { $.modal.confirm("确定要退单吗？", function() {
const url = "console/cancel"; const url = "console/cancel";
const data = { "id": id }; const data = { "id": id };
$.operate.post(url, data); $.ajax({
type: "POST",
dataType: "json",
url: url,
data: JSON.stringify(data),
contentType: 'application/json',
success: function (result) {
$.operate.ajaxSuccess(result);
}
}); });
} });
}
function changeConditionBtnChosenStyle(e) { function changeConditionBtnChosenStyle(e) {
$('.condition-btn .btn').removeClass('active-condition-btn'); $('.condition-btn .btn').removeClass('active-condition-btn');

4
ghy-common/src/main/java/com/ghy/common/enums/WxStatusEnum.java
View File

@ -17,8 +17,8 @@ public enum WxStatusEnum {
TEXT("", "dnjTqmqr7OsnOXJR_SikVNNQOPSZLJ6pcDoysOksjNQ"), TEXT("", "dnjTqmqr7OsnOXJR_SikVNNQOPSZLJ6pcDoysOksjNQ"),
NORMAL_ORDER("", "/pages/order-manage/order-manage"), 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"), DEFAULT_ORDER("", "/pages/order-manage/order-manage?stateCur=6"),
/**售后工单待处理提醒**/ /**售后工单待处理提醒**/

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

@ -182,7 +182,7 @@ public class OrderServiceImpl implements OrderService {
Date now = new Date(); Date now = new Date();
// 待接单状态的超时逻辑 // 待接单状态的超时逻辑
if (ZERO.equals(order.getOrderStatus())) { 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 createTime = order.getCreateTime();
Date overTime30min = getOverTime(createTime, 30 * 60 * 1000); Date overTime30min = getOverTime(createTime, 30 * 60 * 1000);
Date overTime1h = 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()); boolean timeout = ONE.equals(order.getTimeout());
log.info("是否超时:{}超时时间为{}", timeout,overTime30min);
if (!timeout) { if (!timeout) {
if (overTime30min.before(now)) { if (overTime30min.before(now)) {
// 30min未接单为超时 // 30min未接单为超时