冲突修改

business/jxstore/cms/sku.go

@@ -392,9 +392,11 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, isBySku bool, params ma
 	FROM sku_name t1
 	LEFT JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = ?
 	LEFT JOIN sku_name_place_bind t3 ON t1.id = t3.name_id
+	LEFT JOIN price_refer_snapshot t4 ON t4.city_code = ? AND t4.snapshot_at = ? AND t4.sku_id = t2.id
 	WHERE t1.deleted_at = ?`
 	sqlParams := []interface{}{
 		utils.DefaultTimeValue,
+		0, utils.Time2Date(time.Now().AddDate(0, 0, -1)),
 		utils.DefaultTimeValue,
 	}
 	if keyword != "" {

business/jxstore/event/event.go

@@ -175,16 +175,16 @@ func GetCheckVendorCookie(ctx *jxcontext.Context, vendorIDs []int, isAuto bool)
 						errMsg += fmt.Sprintf(" 饿百账号:[饿百后台饿鲜达全国账号]的Cookie无效了！", vv)
 						flag = true
 					}
-					result2, err2 := api.EbaiAPI.GetExianDaSkuDepot("190600741")
-					if err2 != nil || result2 == nil {
-						cc := &CheckCookie{}
-						cc.VendorID = v
-						cc.VendorOrgCode = "饿鲜达供应链系统"
-						cc.Status = "无效"
-						ccList = append(ccList, cc)
-						errMsg += fmt.Sprintf(" 饿百账号:[饿鲜达供应链系统]的Cookie无效了！", vv)
-						flag = true
-					}
+					// result2, err2 := api.EbaiAPI.GetExianDaSkuDepot("190600741")
+					// if err2 != nil || result2 == nil {
+					// 	cc := &CheckCookie{}
+					// 	cc.VendorID = v
+					// 	cc.VendorOrgCode = "饿鲜达供应链系统"
+					// 	cc.Status = "无效"
+					// 	ccList = append(ccList, cc)
+					// 	errMsg += fmt.Sprintf(" 饿百账号:[饿鲜达供应链系统]的Cookie无效了！", vv)
+					// 	flag = true
+					// }
 				case model.VendorIDMTWM:
 					_, err := api.MtwmAPI.PackagePriceGet(mtStoreID)
 					if err != nil {

business/model/sku.go

@@ -284,9 +284,10 @@ type SkuWithVendor struct {
 
 type SkuNameExt struct {
 	SkuName
-	Skus      []*SkuWithVendor `orm:"-" json:"skus"`
-	SkusStr   string           `json:"-"`
-	FullName  string           `json:"fullName"`
-	Places    []int            `orm:"-" json:"places"`
-	PlacesStr string           `json:"-"`
+	Skus         []*SkuWithVendor `orm:"-" json:"skus"`
+	SkusStr      string           `json:"-"`
+	FullName     string           `json:"fullName"`
+	Places       []int            `orm:"-" json:"places"`
+	PlacesStr    string           `json:"-"`
+	MidUnitPrice int              `json:"midUnitPrice"`
 }