diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 1bf33fe19..ed1f64ef6 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -736,14 +736,7 @@ func getGetStoresSkusBaseSQL(db *dao.DaoDB, storeIDs, skuIDs []int, upcs []strin func GetStoresSkus(ctx *jxcontext.Context, storeIDs, skuIDs []int, upcs []string, isFocus, isHighPrice bool, priceType int, keyword string, isBySku, isAct bool, params map[string]interface{}, offset, pageSize int) (skuNamesInfo *dao.StoreSkuNamesInfo, err error) { //权限 管理员/未登录人员不进入,商城不进入 - fmt.Println("aaaaaaaaaaaaaaaaaaaaaaaa", strings.Split(ctx.GetToken(), ".")[4]) - if permission.IsRoled(ctx) { - // 登录人员,来自小程序不做处理 - fmt.Println(111111) - if "weixinmini" == strings.Split(ctx.GetToken(), ".")[4] { - fmt.Println(2222) - return GetStoresSkusNew(ctx, storeIDs, skuIDs, upcs, isFocus, isHighPrice, priceType, keyword, isBySku, isAct, params, offset, pageSize) - } + if permission.IsRoled(ctx) || ("weixinmini" == strings.Split(ctx.GetToken(), ".")[4]) { if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil { var storeIDs2 []int if len(storeIDs) > 0 { diff --git a/tests/default_test.go b/tests/default_test.go index 217f28498..4487844b6 100644 --- a/tests/default_test.go +++ b/tests/default_test.go @@ -20,20 +20,7 @@ func init() { // TestGet is a sample to run an endpoint test func TestGet(t *testing.T) { - fmt.Print("测试中\n") - fmt.Print("测试中1") - //r, _ := http.NewRequest("GET", "/v1/object", nil) - //w := httptest.NewRecorder() - //beego.BeeApp.Handlers.ServeHTTP(w, r) - // - //beego.Trace("testing", "TestGet", "Code[%d]\n%s", w.Code, w.Body.String()) - // - //Convey("Subject: Test Station Endpoint\n", t, func() { - // Convey("Status Code Should Be 200", func() { - // So(w.Code, ShouldEqual, 200) - // }) - // Convey("The Result Should Not Be Empty", func() { - // So(w.Body.Len(), ShouldBeGreaterThan, 0) - // }) - //}) + fmt.Println(7&16 != 0) + fmt.Println(3&16 != 0) + fmt.Println(23&16 != 0) }