From ae1f5c7b0ad1a9414451110079a321c750aafca3 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Wed, 13 Oct 2021 11:43:01 +0800
Subject: [PATCH] aa

---
 business/jxstore/act/act.go       | 7 +++++--
 business/jxstore/tempop/tempop.go | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go
index 3c9487f29..1e0a5a524 100644
--- a/business/jxstore/act/act.go
+++ b/business/jxstore/act/act.go
@@ -2090,8 +2090,11 @@ func RrefreshEbaiVendorAct(ctx *jxcontext.Context) (err error) {
 								`
 							sqlParams := []interface{}{storeMap.StoreID, sku.Skuid}
 							if err = dao.GetRow(db, &storeSkuBind, sql, sqlParams); err == nil && storeSkuBind != nil {
-								actVendorSku.SkuID = storeSkuBind.SkuID
-								actVendorSku.OriginPrice = jxutils.IntPrice2Standard(int64(storeSkuBind.Price))
+								if actSkus, _ := dao.GetEffectiveActStoreSkuInfo(db, 0, []int{model.VendorIDMTWM}, model.ActTypeAll, []int{storeMap.StoreID},
+									[]int{storeSkuBind.SkuID}, utils.Timestamp2Time(result.Starttime), utils.Timestamp2Time(result.Endtime)); len(actSkus) == 0 {
+									actVendorSku.SkuID = storeSkuBind.SkuID
+									actVendorSku.OriginPrice = jxutils.IntPrice2Standard(int64(storeSkuBind.Price))
+								}
 							}
 							dao.CreateEntity(db, actVendorSku)
 						}
diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 9a485d8a6..fd0562076 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1973,7 +1973,8 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	//		}
 	//	}
 	//}
-	act.RrefreshMtwmVendorAct(jxcontext.AdminCtx)
+	//act.RrefreshMtwmVendorAct(jxcontext.AdminCtx)
+	act.RrefreshEbaiVendorAct(jxcontext.AdminCtx)
 	//var (
 	//	db       = dao.GetDB()
 	//	skuNames []*model.SkuName