diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go index dc4204f30..3c9487f29 100644 --- a/business/jxstore/act/act.go +++ b/business/jxstore/act/act.go @@ -2003,25 +2003,28 @@ func RrefreshMtwmVendorAct(ctx *jxcontext.Context) (err error) { if actList, _ := mtapi.RetailDiscountList(storeMap.VendorStoreID, k); len(actList) > 0 { for _, act := range actList { if act.Status > 0 { - 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 actSkus, _ := dao.GetEffectiveActStoreSkuInfo(db, 0, []int{model.VendorIDMTWM}, model.ActTypeAll, []int{storeMap.StoreID}, + []int{utils.Str2Int(act.AppFoodCode)}, utils.Timestamp2Time(act.StartTime), utils.Timestamp2Time(act.EndTime)); len(actSkus) == 0 { + 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/tempop/tempop.go b/business/jxstore/tempop/tempop.go index 0a55830dc..9a485d8a6 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "fmt" + "git.rosy.net.cn/jx-callback/business/jxstore/act" "net" "regexp" "strconv" @@ -1972,27 +1973,27 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { // } // } //} - //act.RrefreshMtwmVendorAct(jxcontext.AdminCtx) - var ( - db = dao.GetDB() - skuNames []*model.SkuName - id1 []int - id2 []int - ) - sql := ` - SELECT * FROM sku_name where img like '%origin%' ORDER BY img - ` - dao.GetRows(db, &skuNames, sql) - for _, skuName := range skuNames { - data, _, err := jxutils.DownloadFileByURL("http://image.jxc4.com/1616546694origin549a181bN32f4da48.jpg") - if data == nil || err != nil { - id1 = append(id1, skuName.ID) - } else { - id2 = append(id2, skuName.ID) - } - } - fmt.Println("exeNOimg id1", id1) - fmt.Println("exeNOimg id2", id2) + act.RrefreshMtwmVendorAct(jxcontext.AdminCtx) + //var ( + // db = dao.GetDB() + // skuNames []*model.SkuName + // id1 []int + // id2 []int + //) + //sql := ` + // SELECT * FROM sku_name where img like '%origin%' and upc <> '' ORDER BY img + //` + //dao.GetRows(db, &skuNames, sql) + //for _, skuName := range skuNames { + // data, _, err := jxutils.DownloadFileByURL("http://image.jxc4.com/1616546694origin549a181bN32f4da48.jpg") + // if data == nil || err != nil { + // id1 = append(id1, skuName.ID) + // } else { + // id2 = append(id2, skuName.ID) + // } + //} + //fmt.Println("exeNOimg id1", id1) + //fmt.Println("exeNOimg id2", id2) return err }