diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go index 590ec5e8f..dffe2b4d2 100644 --- a/business/jxstore/cms/cms.go +++ b/business/jxstore/cms/cms.go @@ -8,6 +8,8 @@ import ( "strings" "time" + "git.rosy.net.cn/jx-callback/business/partner/purchase/ebai" + "git.rosy.net.cn/baseapi/utils/errlist" "git.rosy.net.cn/jx-callback/globals/api2" @@ -150,6 +152,7 @@ func InitServiceInfo(version string, buildTime time.Time, gitCommit string) { "apiFunctionName": model.ApiFunctionName, "vendorStatus": model.VendorStatus, "couponsStatus": model.CouponStatusName, + "ebaiSupplierID": ebai.EbaiSupplierIDMap, }, } } diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index 6dcd8e695..0ac88c7a5 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -407,8 +407,8 @@ func GetStoreCategories(db *DaoDB, vendorID, storeID int, skuIDs []int, level in LEFT JOIN store_sku_category_map t5p ON t4p.id = t5p.category_id AND t5.store_id = t5p.store_id AND t5p.deleted_at = ? LEFT JOIN store_map t1 ON t1.store_id = t5.store_id AND t1.vendor_id = ? LEFT JOIN store t6 ON t6.id = t5.store_id - WHERE t5.store_id = ? AND t5.deleted_at = ? AND t4.is_sync <> ?` - sqlParams = append(sqlParams, utils.DefaultTimeValue, utils.DefaultTimeValue, vendorID, storeID, utils.DefaultTimeValue, model.YES) + WHERE t5.store_id = ? AND t4.is_sync <> ?` + sqlParams = append(sqlParams, utils.DefaultTimeValue, utils.DefaultTimeValue, vendorID, storeID, model.YES) if mustDirty { sql += " AND t5.%s_sync_status <> 0" fieldPrefixParams = append(fieldPrefixParams, fieldPrefix) @@ -417,6 +417,8 @@ func GetStoreCategories(db *DaoDB, vendorID, storeID int, skuIDs []int, level in sql += " AND t4.level = ?" sqlParams = append(sqlParams, level) } + fmt.Println(sql) + fmt.Println(sqlParams) if err = GetRows(db, &cats, fmt.Sprintf(sql, fieldPrefixParams...), sqlParams...); err != nil { return nil, err } diff --git a/business/partner/purchase/ebai/ebai.go b/business/partner/purchase/ebai/ebai.go index 3a222d025..efba276f2 100644 --- a/business/partner/purchase/ebai/ebai.go +++ b/business/partner/purchase/ebai/ebai.go @@ -13,6 +13,20 @@ import ( "git.rosy.net.cn/jx-callback/globals/api" ) +const ( + EbaiSupplierIDsc = "1486975681715" + EbaiSupplierIDc4 = "2233065879" + EbaiSupplierIDgy = "2267230126" +) + +var ( + EbaiSupplierIDMap = map[string]string{ + EbaiSupplierIDsc: "饿百商超", + EbaiSupplierIDc4: "饿百好菜", + EbaiSupplierIDgy: "饿百果园", + } +) + var ( CurPurchaseHandler *PurchaseHandler )