From 5618869ee24e679a4fabe3df5168d8ea9c22ab89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Tue, 25 Jul 2023 09:31:37 +0800
Subject: [PATCH] 1

---
 business/jxstore/act/act.go   |  40 +++++-----
 business/jxstore/misc/misc.go | 137 ++++++++++++++++++----------------
 2 files changed, 91 insertions(+), 86 deletions(-)

diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go
index e214e0724..44a339927 100644
--- a/business/jxstore/act/act.go
+++ b/business/jxstore/act/act.go
@@ -2030,27 +2030,27 @@ func RrefreshMtwmVendorAct(ctx *jxcontext.Context) (err error) {
 				if len(actList) > 0 {
 					for _, act := range actList {
 						if act.Status > 0 {
-							//if checkActStoreSkuExist(db, storeMap.StoreID, utils.Str2Int(act.AppFoodCode), model.VendorIDMTWM, utils.Timestamp2Time(act.StartTime), utils.Timestamp2Time(act.EndTime)) {
-							actVendor := &model.ActMtwmVendor{
-								StoreID:             storeMap.StoreID,
-								SkuID:               utils.Str2Int(act.AppFoodCode),
-								VendorStoreID:       storeMap.VendorStoreID,
-								ActType:             v,
-								BeginAt:             utils.Timestamp2Time(act.StartTime),
-								EndAt:               utils.Timestamp2Time(act.EndTime),
-								SkuName:             act.Name,
-								OriginPrice:         act.OriginalPrice,
-								ActPrice:            act.ActPrice,
-								DiscountCoefficient: act.DiscountCoefficient,
-								Status:              act.Status,
-								ItemID:              utils.Int64ToStr(act.ItemID),
-								OrderLimit:          act.OrderLimit,
-								Period:              act.Period,
-								WeeksTime:           act.WeeksTime,
-								SettingType:         act.SettingType,
+							if checkActStoreSkuExist(db, storeMap.StoreID, utils.Str2Int(act.AppFoodCode), model.VendorIDMTWM, utils.Timestamp2Time(act.StartTime), utils.Timestamp2Time(act.EndTime)) {
+								actVendor := &model.ActMtwmVendor{
+									StoreID:             storeMap.StoreID,
+									SkuID:               utils.Str2Int(act.AppFoodCode),
+									VendorStoreID:       storeMap.VendorStoreID,
+									ActType:             v,
+									BeginAt:             utils.Timestamp2Time(act.StartTime),
+									EndAt:               utils.Timestamp2Time(act.EndTime),
+									SkuName:             act.Name,
+									OriginPrice:         act.OriginalPrice,
+									ActPrice:            act.ActPrice,
+									DiscountCoefficient: act.DiscountCoefficient,
+									Status:              act.Status,
+									ItemID:              utils.Int64ToStr(act.ItemID),
+									OrderLimit:          act.OrderLimit,
+									Period:              act.Period,
+									WeeksTime:           act.WeeksTime,
+									SettingType:         act.SettingType,
+								}
+								dao.CreateEntity(db, actVendor)
 							}
-							dao.CreateEntity(db, actVendor)
-							//}
 						}
 					}
 				}
diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 04df5aa5c..3221973bb 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -283,71 +283,71 @@ func Init() {
 		if beego.BConfig.RunMode != "jxgy" {
 			ScheduleTimerFunc("RefreshSyncSkuList_tao", func() {
 				var beijin = []int{
-					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,
-					669158,
-					668691,
-					668673,
-					668282,
-					667447,
-					667354,
-					667321,
-					667319,
-					667316,
-					667269,
-					667268,
-					667267,
-					667260,
-					667132,
-					667094,
-					667030,
-					666965,
-					666714,
-					666708,
+					//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,
+					//669158,
+					//668691,
+					//668673,
+					//668282,
+					//667447,
+					//667354,
+					//667321,
+					//667319,
+					//667316,
+					//667269,
+					//667268,
+					//667267,
+					//667260,
+					//667132,
+					//667094,
+					//667030,
+					//666965,
+					//666714,
+					//666708,
 					666705,
 					103437,
 					103349,
@@ -418,11 +418,16 @@ func Init() {
 				"05:30:00",
 				"07:30:00",
 				"09:55:00",
-				"12:30:00",
+				"10:55:00",
+				"11:55:00",
+				"12:55:00",
 				"13:30:00",
+				"14:30:00",
 				"15:30:00",
+				"16:30:00",
 				"17:30:00",
 				"18:55:00",
+				"19:55:00",
 				"20:30:00",
 				"21:30:00",
 				"22:30:00",