From ebb7424282a05251f0c8f4e2555a94c7a5697640 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 31 Mar 2021 14:52:00 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/user2.go | 20 ++++++++++++++++----
 controllers/cms_user2.go      | 17 +++++++++++++++--
 globals/beegodb/beegodb.go    |  4 ++--
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go
index 7002eb700..a7a920c4f 100644
--- a/business/jxstore/cms/user2.go
+++ b/business/jxstore/cms/user2.go
@@ -8,6 +8,8 @@ import (
 	"sync"
 	"time"
 
+	"git.rosy.net.cn/jx-callback/business/jxstore/permission"
+
 	"git.rosy.net.cn/jx-callback/business/partner/purchase/jd"
 
 	"git.rosy.net.cn/jx-callback/globals/api/apimanager"
@@ -626,7 +628,7 @@ func AddUserDeliveryAddress(ctx *jxcontext.Context, address *model.UserDeliveryA
 	address.AutoAddress, address.DistrictCode, address.CityCode, err = getAddressInfoFromCoord(db, lng, lat)
 	if err == nil {
 		globals.SugarLogger.Debugf("AddUserDeliveryAddress2 address:%s", utils.Format4Output(address, true))
-		txDB , _ := dao.Begin(db)
+		txDB, _ := dao.Begin(db)
 		defer func() {
 			if r := recover(); r != nil {
 				dao.Rollback(db, txDB)
@@ -699,7 +701,7 @@ func UpdateUserDeliveryAddress(ctx *jxcontext.Context, userID string, addressID
 					return err
 				}
 			}
-			txDB , _ := dao.Begin(db)
+			txDB, _ := dao.Begin(db)
 			defer func() {
 				if r := recover(); r != nil {
 					dao.Rollback(db, txDB)
@@ -754,7 +756,7 @@ func SaveUserCart(ctx *jxcontext.Context, userID string, storeID int, cartItems
 		dao.WrapAddIDCULEntity(v, userID)
 	}
 	db := dao.GetDB()
-	txDB , _ := dao.Begin(db)
+	txDB, _ := dao.Begin(db)
 	defer func() {
 		if r := recover(); r != nil || err != nil {
 			dao.Rollback(db, txDB)
@@ -1006,7 +1008,7 @@ func UpdateUserWxNoAndPercent(user *model.User, isReceiver bool) (num int64, err
 	if len(auth) == 0 {
 		return 0, fmt.Errorf("未找到此用户的微信验证方式！用户ID：[%v]\n", user.UserID)
 	}
-	txDB , _ := dao.Begin(db)
+	txDB, _ := dao.Begin(db)
 	defer func() {
 		if r := recover(); r != nil || err != nil {
 			dao.Rollback(db, txDB)
@@ -1177,3 +1179,13 @@ func UpdateUserLastInfo(ctx *jxcontext.Context, storeID, brandID int) (err error
 	}
 	return err
 }
+
+func GetUserStoreAuth(ctx *jxcontext.Context, storeID int) (outStoreID int, err error) {
+	storeMap, _ := permission.GetUserStoresResultMap(ctx.GetUserID())
+	if storeMap[storeID] != 0 {
+		return storeID, err
+	} else {
+		return 0, err
+	}
+	return outStoreID, err
+}
diff --git a/controllers/cms_user2.go b/controllers/cms_user2.go
index ed80f2f05..b81a9707b 100644
--- a/controllers/cms_user2.go
+++ b/controllers/cms_user2.go
@@ -13,11 +13,11 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/business/partner/purchase/jx/localjx"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type User2Controller struct {
-	beego.Controller
+	web.Controller
 }
 
 // @Title 用户注册
@@ -571,3 +571,16 @@ func (c *User2Controller) UpdateUserLastInfo() {
 		return retVal, "", err
 	})
 }
+
+// @Title 查询用户是否拥有当前店铺权限
+// @Description 查询用户是否拥有当前店铺权限
+// @Param	token			header		string	true	"认证token"
+// @Param	storeID			query		int		true	"门店ID"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetUserStoreAuth [get]
+func (c *User2Controller) GetUserStoreAuth() {
+	c.callGetUserStoreAuth(func(params *tUser2GetUserStoreAuthParams) (retVal interface{}, errCode string, err error) {
+		return retVal, "", err
+	})
+}
diff --git a/globals/beegodb/beegodb.go b/globals/beegodb/beegodb.go
index 1dda7090b..a36a7e969 100644
--- a/globals/beegodb/beegodb.go
+++ b/globals/beegodb/beegodb.go
@@ -4,14 +4,14 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/legacymodel"
 	"git.rosy.net.cn/jx-callback/globals"
-	beego "github.com/astaxie/beego/adapter"
 	"github.com/astaxie/beego/client/orm"
+	"github.com/astaxie/beego/server/web"
 )
 
 func Init() {
 	// set default database
 	// orm.RegisterDataBase(aliasName, driverName, dataSource, params)
-	orm.RegisterDataBase("default", "mysql", beego.AppConfig.String("dbConnectStr"))
+	orm.RegisterDataBase("default", "mysql", web.AppConfig.DefaultString("dbConnectStr", ""))
 	orm.RegisterModel(new(legacymodel.Config))
 	orm.RegisterModel(new(legacymodel.BlackClient))
 	orm.RegisterModel(new(legacymodel.JxBadComments))