From baa9157949c8401351b55ba6d8860f38364aa89c Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Tue, 6 Aug 2019 11:49:42 +0800
Subject: [PATCH] =?UTF-8?q?-=20User=E6=B7=BB=E5=8A=A0Remark?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/authz.go | 13 ++++++++-----
 business/jxstore/cms/user2.go |  6 +++---
 business/model/user.go        |  1 +
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/business/jxstore/cms/authz.go b/business/jxstore/cms/authz.go
index 7ced42b36..9392f6e48 100644
--- a/business/jxstore/cms/authz.go
+++ b/business/jxstore/cms/authz.go
@@ -10,16 +10,16 @@ import (
 )
 
 func TransferLegacyWeixins() (err error) {
+	const remark4Transfer = "transfer"
 	// DELETE t1
 	// FROM auth_bind t1
-	// WHERE t1.created_at > '2019-08-05';
+	// WHERE t1.remark = 'transfer';
 
 	// DELETE t1
 	// FROM user t1
-	// WHERE t1.created_at > '2019-08-05';
+	// WHERE t1.remark = 'transfer';
 
-	// DELETE t1
-	// FROM casbin_rule t1;
+	// TRUNCATE TABLE casbin_rule;
 
 	sql := `
 	SELECT *
@@ -46,6 +46,7 @@ func TransferLegacyWeixins() (err error) {
 				Name:    v.NickName,
 				Mobile:  v.Tel,
 				Type:    model.UserTypeStoreBoss,
+				Remark:  remark4Transfer,
 			}
 			if user.Name == "" {
 				user.Name = user.Mobile
@@ -56,7 +57,7 @@ func TransferLegacyWeixins() (err error) {
 			}
 			// globals.SugarLogger.Debug(utils.Format4Output(user, false))
 			if len(userList) == 0 {
-				err = CreateUser(user)
+				err = CreateUser(user, v.LastOperator)
 			} else {
 				user = userList[0]
 			}
@@ -70,6 +71,7 @@ func TransferLegacyWeixins() (err error) {
 							Type:    weixin.AuthTypeMP,
 							AuthID:  v.OpenID,
 							AuthID2: v.OpenIDUnion,
+							Remark:  remark4Transfer,
 						},
 					},
 				})
@@ -81,6 +83,7 @@ func TransferLegacyWeixins() (err error) {
 							Type:    weixin.AuthTypeMini,
 							AuthID:  v.OpenIDMini,
 							AuthID2: v.OpenIDUnion,
+							Remark:  remark4Transfer,
 						},
 					},
 				})
diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go
index 2612ff43b..e1764c898 100644
--- a/business/jxstore/cms/user2.go
+++ b/business/jxstore/cms/user2.go
@@ -86,7 +86,7 @@ func RegisterUser(user *model.User, mobileVerifyCode string, inAuthInfo *auth2.A
 		if inAuthInfo.AuthBindInfo.Type == dingding.AuthTypeStaff {
 			user.Type |= model.UserTypeOperator
 		}
-		if err = CreateUser(user); err == nil {
+		if err = CreateUser(user, "RegisterUser"); err == nil {
 			if outAuthInfo, err = auth2.BindUser(mobileAuth, user); err == nil && inAuthInfo != nil {
 				err = auth2.AddAuthBind(&outAuthInfo.UserBasic, inAuthInfo)
 			}
@@ -109,11 +109,11 @@ func GetUserBindAuthInfo(ctx *jxcontext.Context) (authList []*model.AuthBind, er
 	return nil, err
 }
 
-func CreateUser(user *model.User) (err error) {
+func CreateUser(user *model.User, creatorName string) (err error) {
 	if user == nil || user.UserID2 == "" || user.Name == "" || user.Mobile == "" {
 		return ErrUserIDAndNameMustGiven
 	}
-	dao.WrapAddIDCULDEntity(user, "RegisterUser")
+	dao.WrapAddIDCULDEntity(user, creatorName)
 	user.UserID = utils.GetUUID()
 	user.Status = model.UserStatusNormal
 	return dao.CreateEntity(nil, user)
diff --git a/business/model/user.go b/business/model/user.go
index 99349af90..0c92d0254 100644
--- a/business/model/user.go
+++ b/business/model/user.go
@@ -31,6 +31,7 @@ type User struct {
 	Status   int8   `json:"status"`
 	Type     int8   `json:"type"`                                       // 用户类型
 	IDCardNo string `orm:"size(18);column(id_card_no)" json:"idCardNo"` // 身份证号
+	Remark   string `orm:"size(255)" json:"remark"`
 }
 
 func (*User) TableUnique() [][]string {