From 03296d1a995cebfb7e909f2a8f1a424a6f1a26cc Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 30 Aug 2019 15:56:43 +0800 Subject: [PATCH] =?UTF-8?q?-=20dao.GetSkuByCats=E4=B8=AD=EF=BC=8C=E8=A6=81?= =?UTF-8?q?=E5=88=A4=E6=96=ADsku=5Fname=E6=98=AF=E5=90=A6=E8=A2=AB?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/model/dao/sku.go | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/business/model/dao/sku.go b/business/model/dao/sku.go index bedf9d785..33c8f238b 100644 --- a/business/model/dao/sku.go +++ b/business/model/dao/sku.go @@ -8,6 +8,16 @@ import ( "git.rosy.net.cn/jx-callback/globals" ) +type SkuCategoryWithVendor struct { + model.SkuCategory + + VendorID int `orm:"column(vendor_id)" json:"vendorID"` + VendorOrgCode string `orm:"size(32)" json:"vendorOrgCode"` // 同一平台下不同的商户代码，如果只有一个，可以为空 + + VendorCatID string `orm:"size(32);column(vendor_cat_id)" json:"vendorCatID"` + SyncStatus int8 `orm:"default(2)"` +} + func GetSellCities(db *DaoDB, nameID int, vendorID int) (cities []*model.Place, err error) { cities = []*model.Place{} sql := ` @@ -148,18 +158,18 @@ func GetSkuByCats(db *DaoDB, catIDs []int) (skuList []*model.Sku, err error) { sql := ` SELECT t1.* FROM sku t1 - JOIN sku_name t2 ON t2.id = t1.name_id - WHERE t1.deleted_at = ? - ` + JOIN sku_name t2 ON t2.id = t1.name_id AND t2.deleted_at = ? + WHERE t1.deleted_at = ?` sqlParams := []interface{}{ utils.DefaultTimeValue, + utils.DefaultTimeValue, } if len(catIDs) > 0 { sql += " AND t2.category_id IN (" + GenQuestionMarks(len(catIDs)) + ")" sqlParams = append(sqlParams, catIDs) } err = GetRows(db, &skuList, sql, sqlParams...) - globals.SugarLogger.Debugf("GetSkuByCats err:%v", err) + // globals.SugarLogger.Debugf("GetSkuByCats err:%v", err) return skuList, err } @@ -187,3 +197,6 @@ func SetSkuSyncStatus(db *DaoDB, vendorID int, skuIDs []int, syncStatus int) (nu } return ExecuteSQL(db, sql, sqlParams...) } + +// func GetSkuCategoryWithVendor(db *DaoDB, vendorIDs []int, appOrgCodes []string, catIDs []int) (num int64, err error) { +// }