From 567046a238c8f9f59a057e035bf3184560e254f9 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Tue, 13 Aug 2019 14:59:19 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E5=9C=A8beta=E4=B8=8A=E5=90=AF=E7=94=A8Ena?=
 =?UTF-8?q?bleWXAuth2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go                | 13 ++++++++-----
 business/jxstore/cms/store_sku_check_test.go |  4 +++-
 controllers/cms_user2.go                     | 10 +++++-----
 globals/globals.go                           |  1 +
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 496ac9f43..28effeecb 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -533,10 +533,11 @@ func UpdateStore(ctx *jxcontext.Context, storeID int, payload map[string]interfa
 	}
 
 	valid := dao.StrictMakeMapByStructObject(payload, store, userName)
-	if err = dao.ValidateRoles(db, utils.Interface2String(valid["marketManRole"]), utils.Interface2String(valid["OperatorRole"])); err != nil {
-		return 0, err
+	if globals.EnableWXAuth2 {
+		if err = dao.ValidateRoles(db, utils.Interface2String(valid["marketManRole"]), utils.Interface2String(valid["OperatorRole"])); err != nil {
+			return 0, err
+		}
 	}
-
 	if payload["lng"] != nil || payload["lat"] != nil {
 		intLng := jxutils.StandardCoordinate2Int(utils.Interface2Float64WithDefault(payload["lng"], 0.0))
 		intLat := jxutils.StandardCoordinate2Int(utils.Interface2Float64WithDefault(payload["lat"], 0.0))
@@ -714,8 +715,10 @@ func CreateStore(ctx *jxcontext.Context, storeExt *StoreExt, userName string) (i
 		return 0, fmt.Errorf("ID:%d不是合法的京西门店编号", store.ID)
 	}
 	db := dao.GetDB()
-	if err = dao.ValidateRoles(db, store.MarketManRole, store.OperatorRole); err != nil {
-		return 0, err
+	if globals.EnableWXAuth2 {
+		if err = dao.ValidateRoles(db, store.MarketManRole, store.OperatorRole); err != nil {
+			return 0, err
+		}
 	}
 	existingID := store.ID
 	store.Lng = jxutils.StandardCoordinate2Int(storeExt.FloatLng)
diff --git a/business/jxstore/cms/store_sku_check_test.go b/business/jxstore/cms/store_sku_check_test.go
index 0bd177103..731575b51 100644
--- a/business/jxstore/cms/store_sku_check_test.go
+++ b/business/jxstore/cms/store_sku_check_test.go
@@ -2,10 +2,12 @@ package cms
 
 import (
 	"testing"
+
+	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 )
 
 func TestCheckSkuDiffBetweenJxAndVendor(t *testing.T) {
 	vendorIDList := []int{}
 	storeIDList := []int{}
-	CheckSkuDiffBetweenJxAndVendor(vendorIDList, storeIDList)
+	CheckSkuDiffBetweenJxAndVendor(jxcontext.AdminCtx, vendorIDList, storeIDList)
 }
diff --git a/controllers/cms_user2.go b/controllers/cms_user2.go
index 6750786cf..c7d84e26e 100644
--- a/controllers/cms_user2.go
+++ b/controllers/cms_user2.go
@@ -132,8 +132,8 @@ func (c *User2Controller) GetRoleUserList() {
 // @Title 给指定用户添加角色列表
 // @Description 给指定用户添加角色列表
 // @Param	token			header		string	true	"认证token"
-// @Param	userID			query		string	true	"用户ID"
-// @Param	roleList		query		string	true	"角色列表"
+// @Param	userID			formData	string	true	"用户ID"
+// @Param	roleList		formData	string	true	"角色列表"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /AddRoles4User [post]
@@ -168,9 +168,9 @@ func (c *User2Controller) DeleteRoles4User() {
 // @Title 给指定角色添加用户列表
 // @Description 给指定角色添加用户列表
 // @Param	token			header		string	true	"认证token"
-// @Param	roleName		query		string	true	"角色名"
-// @Param	storeID			query		int		false	"门店ID"
-// @Param	userIDs			query		string	true	"用户ID列表"
+// @Param	roleName		formData	string	true	"角色名"
+// @Param	storeID			formData	int		false	"门店ID"
+// @Param	userIDs			formData	string	true	"用户ID列表"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /AddUsers4Role [post]
diff --git a/globals/globals.go b/globals/globals.go
index 101208984..e02174f9f 100644
--- a/globals/globals.go
+++ b/globals/globals.go
@@ -89,6 +89,7 @@ func Init() {
 	StoreName = beego.AppConfig.DefaultString("storeName", "京西菜市")
 
 	EnableNewAct = true
+	EnableWXAuth2 = beego.BConfig.RunMode == "beta"
 }
 
 func IsCallbackAlwaysReturnSuccess() bool {