京西折扣修改

business/jxstore/act/act.go

@@ -1529,7 +1529,15 @@ func ChangeJxPriceByDiscountAct(ctx *jxcontext.Context) {
 		if len(actStoreSkus) == 0 {
 			continue
 		}
-		for _, actStoreSku := range actStoreSkus {
+		for _, actStoreSku2 := range actStoreSkus {
+			actStoreSku := &model.ActStoreSku{
+				ActID:         actStoreSku2.ActID,
+				OriginalPrice: actStoreSku2.OriginalPrice,
+				StoreID:       actStoreSku2.StoreID,
+				SkuID:         actStoreSku2.SkuID,
+				TrendPrcie:    actStoreSku2.TrendPrcie,
+				TrendType:     actStoreSku2.TrendType,
+			}
 			storeSkus, _ := dao.GetStoresSkusInfo(db, []int{actStoreSku.StoreID}, []int{actStoreSku.SkuID})
 			if len(storeSkus) == 0 {
 				continue

business/jxstore/misc/misc.go

@@ -259,20 +259,18 @@ func Init() {
 			}
 			cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, nil, 0, db, partner.GetMultiStoreVendorIDs(), storeList, false, nil, []int{27379}, syncFlag, true, true)
 		}, exSyncList)
-	}
-	ScheduleTimerFunc("AutoSaleStoreSku", func() {
-		cms.AutoSaleStoreSku(jxcontext.AdminCtx, nil, false)
-	}, autoSaleStoreSkuTimeList)
-
-	ScheduleTimerFunc("ChangeJxPriceByDiscountAct", func() {
-		act.ChangeJxPriceByDiscountAct(jxcontext.AdminCtx)
-	}, discountActJxList)
-
 		ScheduleTimerFunc("CreateOrderByPriceDefend", func() {
 			localjx.CreateOrderByPriceDefend(jxcontext.AdminCtx)
 		}, []string{
 			"22:00:00",
 		})
+		ScheduleTimerFunc("ChangeJxPriceByDiscountAct", func() {
+			act.ChangeJxPriceByDiscountAct(jxcontext.AdminCtx)
+		}, discountActJxList)
+	}
+	ScheduleTimerFunc("AutoSaleStoreSku", func() {
+		cms.AutoSaleStoreSku(jxcontext.AdminCtx, nil, false)
+	}, autoSaleStoreSkuTimeList)
 
 	if beego.BConfig.RunMode == "jxgy" {
 		ScheduleTimerFunc("SyncMatterC4ToGy", func() {