From 874ffbc80d7bc960a5e03c21fff977a3da5a4275 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, 21 Jul 2023 11:55:45 +0800
Subject: [PATCH] 1

---
 business/jxstore/misc/misc.go      | 196 ++++++++++++++++-------------
 business/partner/delivery/rider.go |   6 +-
 2 files changed, 113 insertions(+), 89 deletions(-)

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index d118bc802..43493e930 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -285,98 +285,122 @@ func Init() {
 				669158,
 				668691,
 				668673,
-				//668282,
-				//667447,
-				//667354,
-				//667321,
-				//667319,
-				//667316,
-				//667269,
-				//667268,
-				//667267,
-				//667260,
-				//667132,
-				//667094,
-				//667030,
-				//666965,
-				//666714,
-				//666708,
-				//666705,
-				//103437,
-				//103349,
-				//103123,
-				//103121,
-				//103106,
-				//103038,
-				//103028,
-				//103019,
-				//102831,
-				//102751,
-				//102683,
-				//102542,
-				//102514,
-				//102382,
-				//102182,
-				//102178,
-				//102173,
-				//102098,
-				//102094,
-				//102080,
-				//102072,
-				//102069,
-				//101870,
-				//101869,
-				//101868,
-				//101867,
-				//101866,
-				//101865,
-				//100956,
-				//100930,
-				//100871,
-				//100786,
-				//100746,
-				//100744,
-				//100726,
-				//100705,
-				//100400,
-				//100111,
-				//100108,
-				//100106,
-				//100104,
-				//100103,
-				//100102,
-				//100100,
-				//100097,
-				//100096,
-				//100095,
-				//100093,
-				//100092,
-				//100089,
-				//100087,
-				//100086,
-				//100085,
-				//100082,
-				//100079,
-				//100078,
-
+				668282,
+				667447,
+				667354,
+				667321,
+				667319,
+				667316,
+				667269,
+				667268,
+				667267,
+				667260,
+				667132,
+				667094,
+				667030,
+				666965,
+				666714,
+				666708,
+				666705,
+				103437,
+				103349,
+				103123,
+				103121,
+				103106,
 			}
 			syncStoreSkuTao(beijin)
 		}, []string{
-			"01:40:00",
-			"03:40:00",
-			"05:20:00",
-			"07:40:00",
-			"08:40:00",
+			"00:30:00",
+			"01:30:00",
+			"02:30:00",
+			"03:30:00",
+			"04:30:00",
+			"05:30:00",
+			"07:30:00",
 			"09:30:00",
-			"11:05:00",
-			"12:40:00",
+			"12:30:00",
+			"13:30:00",
+			"15:30:00",
+			"17:30:00",
+			"18:30:00",
+			"20:30:00",
+			"21:30:00",
+			"22:30:00",
+			"23:30:00",
+		})
+		ScheduleTimerFunc("RefreshSyncSkuList_tao2", func() {
+			var beijin = []int{
+				103038,
+				103028,
+				103019,
+				102831,
+				102751,
+				102683,
+				102542,
+				102514,
+				102382,
+				102182,
+				102178,
+				102173,
+				102098,
+				102094,
+				102080,
+				102072,
+				102069,
+				101870,
+				101869,
+				101868,
+				101867,
+				101866,
+				101865,
+				100956,
+				100930,
+				100871,
+				100786,
+				100746,
+				100744,
+				100726,
+				100705,
+				100400,
+				100111,
+				100108,
+				100106,
+				100104,
+				100103,
+				100102,
+				100100,
+				100097,
+				100096,
+				100095,
+				100093,
+				100092,
+				100089,
+				100087,
+				100086,
+				100085,
+				100082,
+				100079,
+				100078,
+			}
+			syncStoreSkuTao(beijin)
+		}, []string{
+			"01:00:00",
+			"02:00:00",
+			"03:00:00",
+			"04:00:00",
+			"05:00:00",
+			"06:00:00",
+			"08:00:00",
+			"09:00:00",
+			"12:00:00",
 			"13:00:00",
 			"15:00:00",
-			"17:20:00",
-			"18:40:00",
-			"20:40:00",
-			"22:40:00",
-			"23:40:00",
+			"17:00:00",
+			"18:00:00",
+			"20:00:00",
+			"21:00:00",
+			"22:00:00",
+			"23:00:00",
 		})
 
 		// 刷新抖音门店token
diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go
index 45fe08caa..46411c454 100644
--- a/business/partner/delivery/rider.go
+++ b/business/partner/delivery/rider.go
@@ -96,9 +96,9 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
 			continue
 		}
 
-		if (v.WaybillVendorID == model.YES || v.WaybillVendorID == -1) && v.VendorID == model.VendorIDMTWM {
-			continue
-		}
+		//if (v.WaybillVendorID == model.YES || v.WaybillVendorID == -1) && v.VendorID == model.VendorIDMTWM {
+		//	continue
+		//}
 
 		if orderId == "" { // 订单id为空是,是定时轮询操作,不做此状态
 			waybillList, _ := dao.GetWaybills(dao.GetDB(), v.VendorOrderID, nil)