diff --git a/ele/auto-meal-complete.user.js b/ele/auto-meal-complete.user.js index 868a34d..59f58f4 100644 --- a/ele/auto-meal-complete.user.js +++ b/ele/auto-meal-complete.user.js @@ -81,7 +81,7 @@ // "queryType": "COOKING" }) } - async function mealComplete(order, cookTime) { + async function mealComplete(cook, cookTime) { let orderId = cook.id let daySn = cook.header.daySn let result = await request('ShipmentService', 'mealComplete', { @@ -100,7 +100,7 @@ async function checkCooking() { if (!ele.processOrders) return for (const cook of ele.processOrders) { - let orderId = cook.id + let daySn = cook.header.daySn if (!cook.mealPreparationInfo || cook.mealPreparationInfo.mealComplete) continue // 骑手到店 并且大于最小上报时长 直接上报出餐 let cookTime = (Date.now() - new Date(cook.activeTime).getTime()) / 1000 @@ -108,17 +108,15 @@ if (cook.deliveryInfo.distTraceView.traceView.status == '骑士已到店' && cook.mealPreparationInfo.minMealCompleteTimeCount < 0 && leftTime < ele.autoSubmitLeftTimeWhenOnShop) { - debug('订单 ' + orderId + ' 骑手到店.') - debug('订单剩余时间 ' + leftTime + 's 小于 ' + ele.autoSubmitLeftTimeWhenOnShop + 's 模拟提交出餐.') + debug('订单 #' + daySn + ' 骑手到店 订单剩余时间 ' + leftTime + 's 小于 ' + ele.autoSubmitLeftTimeWhenOnShop + 's 模拟提交出餐.') return mealComplete(cook, cookTime) } if (leftTime < ele.autoSubmitLeftTime) { // 大于最小上报时长 并且距离上报超时不足120秒 直接上报出餐 - debug('订单 ' + orderId + ' 骑手未到店.') - debug('订单剩余时间 ' + leftTime + 's 小于 ' + ele.autoSubmitLeftTimeWhenOnShop + 's 模拟提交出餐.') + debug('订单 #' + daySn + ' 骑手未到店 订单剩余时间 ' + leftTime + 's 小于 ' + ele.autoSubmitLeftTimeWhenOnShop + 's 模拟提交出餐.') return mealComplete(cook, cookTime) } - debug('订单 ' + orderId + ' 还剩 ' + cook.mealPreparationInfo.commonShowTime + 's 上报超时.') + debug('订单 #' + daySn + ' 还剩 ' + cook.mealPreparationInfo.commonShowTime + 's 上报超时.') cook.mealPreparationInfo.minMealCompleteTimeCount -= 5 cook.mealPreparationInfo.commonShowTime -= 5 } @@ -147,7 +145,10 @@ + '' let orderInfo = '进行中的订单信息: