- auth1与auth2以为是兼容

business/jxstore/cms/authz.go

@@ -8,13 +8,17 @@ 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/model/legacymodel"
+	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api2"
 )
 
 // todo 是否需要将Store.MarketManPhone与OperatorPhone成角色？
 
-func TransferLegacyWeixins() (err error) {
-	const remark4Transfer = "transfer"
+func TransferLegacyWeixins(mobile string) (err error) {
+	if !globals.EnableWXAuth2 {
+		return nil
+	}
+	remark4Transfer := "transfer"
 	// DELETE t1
 	// FROM auth_bind t1
 	// WHERE t1.remark = 'transfer';
@@ -31,11 +35,19 @@ func TransferLegacyWeixins() (err error) {
 	LEFT JOIN user t2 ON t2.mobile = t1.tel
 	LEFT JOIN auth_bind t3 ON t3.auth_id = t1.openid AND t3.type = 'weixinsns'
 	LEFT JOIN auth_bind t4 ON t4.auth_id = t1.openid_mini AND t4.type = 'weixinmini'
-	WHERE t2.id IS NULL OR (t1.openid <> '' AND t3.id IS NULL) OR (t1.openid_mini <> '' AND t4.id IS NULL)
-	ORDER BY t1.parentid;`
+	WHERE`
+	sqlParams := []interface{}{}
+	if mobile != "" {
+		remark4Transfer = "transfer2"
+		sql += " t1.tel = ?"
+		sqlParams = append(sqlParams, mobile)
+	} else {
+		sql += " t2.id IS NULL OR (t1.openid <> '' AND t3.id IS NULL) OR (t1.openid_mini <> '' AND t4.id IS NULL)"
+	}
+	sql += `ORDER BY t1.parentid;`
 	var weixinList []*legacymodel.WeiXins
 	db := dao.GetDB()
-	err = dao.GetRows(db, &weixinList, sql)
+	err = dao.GetRows(db, &weixinList, sql, sqlParams...)
 	if err != nil {
 		return err
 	}
@@ -96,8 +108,14 @@ func TransferLegacyWeixins() (err error) {
 					},
 				})
 			}
-			if v.JxStoreID > 0 && user.Type&model.UserTypeOperator == 0 { // 运营就不加到门店老板组里了
-				api2.RoleMan.AddRole4User(user.GetID(), autils.NewRole(authz.StoreRoleBoss, v.JxStoreID))
+			if v.JxStoreID > 0 { // 运营就不加到门店老板组里了
+				if user.Type&model.UserTypeOperator == 0 {
+					api2.RoleMan.AddRole4User(user.GetID(), autils.NewRole(authz.StoreRoleBoss, v.JxStoreID))
+				}
+			} else {
+				if mobile != "" {
+					api2.RoleMan.DeleteRole4User(user.GetID(), autils.NewRole(authz.StoreRoleBoss, v.JxStoreID))
+				}
 			}
 		}
 	}