From a1e059bde35df0d5b31cf52243d4e86643792ac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 13 May 2022 17:13:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BD=AE=E8=AF=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=AE=A2=E5=8D=95=EF=BC=8C=E5=B0=86=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=9C=88=E5=89=8D=E9=85=8D=E9=80=81=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E8=AE=A2=E5=8D=95=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=AA=91=E6=89=8B=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/misc/misc.go      | 15 +++++++++++----
 business/partner/delivery/rider.go | 13 +++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 5f6c1ba88..da8d1f729 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -341,6 +341,17 @@ func Init() {
 			//刷新饿百平台活动
 			act.RrefreshEbaiVendorAct(jxcontext.AdminCtx)
 		}, dailyWorkTimeList2)
+		// 每五分钟轮询一次推送骑手信息坐标给美团
+		ScheduleTimerFuncByInterval(func() {
+			delivery.GetOrderRiderInfoToPlatform("")
+		}, 10*time.Second, 5*time.Minute)
+
+		// 轮询每天更新当前时间一个月
+		ScheduleTimerFunc("UpdateOrder2Complete", func() {
+			delivery.UpdateOrder2Complete()
+		}, []string{
+			"04:00:00",
+		})
 	}
 	//update xuhang 2022/04/06用于同步京东数据以取代爬取订单 但由于京东的v2API已不支持手机号 因此以下代码暂时注释 后续接入虚拟号可再次open
 	/*	ScheduleTimerFuncByInterval(func() {
@@ -390,10 +401,6 @@ func Init() {
 		}, []string{
 			"20:00:00",
 		})
-		// 每五分钟轮询一次推送骑手信息坐标给美团
-		ScheduleTimerFuncByInterval(func() {
-			delivery.GetOrderRiderInfoToPlatform("")
-		}, 10*time.Second, 5*time.Minute)
 	}
 	if configs, err := dao.QueryConfigs(dao.GetDB(), "ebaiStorePageCookie", model.ConfigTypeCookie, ""); err == nil {
 		ebaiStorePageCookie = configs[0].Value
diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go
index 19c2c7c8d..fb0434d96 100644
--- a/business/partner/delivery/rider.go
+++ b/business/partner/delivery/rider.go
@@ -80,3 +80,16 @@ func GetOrderRiderInfoToPlatform(orderId string) {
 	}
 	return
 }
+
+//将以过期订单状态为配送中的订单修改为完成状态
+func UpdateOrder2Complete() {
+	sql := `UPDATE goods_order g SET  g.status=110 WHERE g.status=20  AND g.order_created_at < ?`
+	sqlParams := []interface{}{
+		time.Now().AddDate(0, 1, 0),
+	}
+	if num, err := dao.ExecuteSQL(dao.GetDB(), sql, sqlParams); err != nil {
+		globals.SugarLogger.Errorf("Update Order Status 20 To 110 Fail")
+		globals.SugarLogger.Debug("Update Order Status 20 To 110 Time,Count", time.Now(), num)
+	}
+	return
+}