刷新京东等级

business/jxstore/cms/store_sku.go

@@ -2473,3 +2473,7 @@ func IsChineseChar(str string) bool {
 	}
 	return false
 }
+
+func GetStoreCategories(ctx *jxcontext.Context, storeID, parentID int) (catList []*model.SkuCategory, err error) {
+	return dao.GetStoreSkuCategories(dao.GetDB(), storeID, parentID)
+}

business/model/dao/act.go

@@ -406,11 +406,11 @@ func GetEffectiveActStoreSkuInfo(db *DaoDB, actID int, vendorIDs []int, actType
 		sqlParams = append(sqlParams, model.GetVendorMask(vendorIDs...), vendorIDs)
 	}
 	if actID > 0 {
-		sql = " AND t1.act_type = ?"
+		sql += " AND t1.id = ?"
 		sqlParams = append(sqlParams, actID)
 	}
 	if actType != model.ActTypeAll {
-		sql = " AND t1.type = ?"
+		sql += " AND t1.type = ?"
 		sqlParams = append(sqlParams, actType)
 	}
 	if len(storeIDs) > 0 {

business/model/dao/sku.go

@@ -63,7 +63,7 @@ func GetCategories(db *DaoDB, parentID, level int, catIDs []int) (cats []*model.
 		params = append(params, parentID)
 	}
 	if len(catIDs) > 0 {
-		sql += " AND t1.id (" + GenQuestionMarks(len(catIDs)) + ")"
+		sql += " AND t1.id IN (" + GenQuestionMarks(len(catIDs)) + ")"
 		params = append(params, catIDs)
 	}
 	if level > 0 {

business/model/dao/store_sku.go

@@ -1028,6 +1028,46 @@ func GetTopCategoriesByStoreIDs(db *DaoDB, storeIDs []int, limit int) (skuCatego
 	return skuCategory, err
 }
 
+func GetStoreSkuCategories(db *DaoDB, storeID, parentID int) (catList []*model.SkuCategory, err error) {
+	sql := `
+	SELECT
+	t1.*
+	FROM sku_category t1
+	JOIN
+	(
+		SELECT DISTINCT t3.category_id
+		FROM store_sku_bind t1
+		JOIN sku t2 ON t2.id = t1.sku_id AND t2.deleted_at = ? AND t2.status = ?
+		JOIN sku_name t3 ON t3.id = t2.name_id AND t3.deleted_at = ? AND t3.status = ?
+		WHERE t1.deleted_at = ? AND t1.status = ? AND t1.store_id = ?
+	) t2 ON t2.category_id = t1.id
+	WHERE t1.deleted_at  = ?`
+	sqlParams := []interface{}{
+		utils.DefaultTimeValue, model.SkuStatusNormal,
+		utils.DefaultTimeValue, model.SkuStatusNormal,
+		utils.DefaultTimeValue, model.SkuStatusNormal, storeID,
+		utils.DefaultTimeValue,
+	}
+	if parentID >= 0 {
+		sql += " AND t1.parent_id = ?"
+		sqlParams = append(sqlParams, parentID)
+	}
+	sql += " ORDER BY t1.level, t1.seq"
+	if err = GetRows(db, &catList, sql, sqlParams...); err == nil && len(catList) > 0 {
+		parentIDMap := make(map[int]int)
+		for _, v := range catList {
+			parentIDMap[v.ParentID] = 1
+		}
+		paretnCats, err2 := GetCategories(db, -1, 0, jxutils.IntMap2List(parentIDMap))
+		if err = err2; err == nil {
+			catList = append(catList, paretnCats...)
+		} else {
+			catList = nil
+		}
+	}
+	return catList, err
+}
+
 func RefershStoreSkusMidPrice(db *DaoDB, storeIDs []int) (count int64, err error) {
 	sql := `
 		UPDATE store_sku_bind a

controllers/cms_store_sku.go

@@ -517,3 +517,21 @@ func (c *StoreSkuController) RefreshJxPriceByExcel() {
 		return retVal, "", err
 	})
 }
+
+// @Title 得到门店的分类列表
+// @Description 得到门店的分类列表(按商品销量)
+// @Param	token			header		string	false	"认证token"
+// @Param	storeID			query		int		true	"门店ID"
+// @Param	parentID		query		int		false	"父分类id"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetStoreCategories [get]
+func (c *StoreSkuController) GetStoreCategories() {
+	c.callGetStoreCategories(func(params *tStoreSkuGetStoreCategoriesParams) (retVal interface{}, errCode string, err error) {
+		if params.MapData["parentID"] == nil {
+			params.ParentID = -1
+		}
+		retVal, err = cms.GetStoreCategories(params.Ctx, params.StoreID, params.ParentID)
+		return retVal, "", err
+	})
+}

routers/commentsRouter_controllers.go

@@ -1476,6 +1476,15 @@ func init() {
 			Filters:          nil,
 			Params:           nil})
 
+	beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"],
+		beego.ControllerComments{
+			Method:           "SaveAndSendAlarmVendorSnapshot",
+			Router:           `/SaveAndSendAlarmVendorSnapshot`,
+			AllowHTTPMethods: []string{"post"},
+			MethodParams:     param.Make(),
+			Filters:          nil,
+			Params:           nil})
+
 	beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"],
 		beego.ControllerComments{
 			Method:           "ScoreStore",
@@ -1593,6 +1602,15 @@ func init() {
 			Filters:          nil,
 			Params:           nil})
 
+	beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"],
+		beego.ControllerComments{
+			Method:           "GetStoreCategories",
+			Router:           `/GetStoreCategories`,
+			AllowHTTPMethods: []string{"get"},
+			MethodParams:     param.Make(),
+			Filters:          nil,
+			Params:           nil})
+
 	beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"],
 		beego.ControllerComments{
 			Method:           "GetStoreSkus",
@@ -1620,6 +1638,15 @@ func init() {
 			Filters:          nil,
 			Params:           nil})
 
+	beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"],
+		beego.ControllerComments{
+			Method:           "GetTopCategorysByStoreIDs",
+			Router:           `/GetTopCategorysByStoreIDs`,
+			AllowHTTPMethods: []string{"get"},
+			MethodParams:     param.Make(),
+			Filters:          nil,
+			Params:           nil})
+
 	beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"],
 		beego.ControllerComments{
 			Method:           "GetTopSkusByStoreIDs",