From 4f7fd9f1e20b2c1930d88e5d48e263df9d631a33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 13 Apr 2021 14:03:11 +0800
Subject: [PATCH] aa

---
 business/jxcallback/orderman/orderman_ext.go | 7 ++++++-
 business/jxstore/cms/user2.go                | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index ecf55669a..af0df5cdd 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -923,6 +923,11 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
 	return saleInfoList, err
 }
 
+type GetAfsOrdersResult struct {
+	model.AfsOrder
+	StoreName string `json:"storeName"`
+}
+
 func (c *OrderManager) GetAfsOrders(ctx *jxcontext.Context, keyword, afsOrderID, vendorOrderID string, vendorIDList, appealTypeList, storeIDList, statusList, skuIDs []int, fromTime, toTime time.Time, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
 	globals.SugarLogger.Debugf("GetAfsOrders")
 	//权限
@@ -1036,7 +1041,7 @@ func (c *OrderManager) GetAfsOrders(ctx *jxcontext.Context, keyword, afsOrderID,
 	`
 	sqlParams = append(sqlParams, pageSize, offset)
 
-	var orders []*model.AfsOrder
+	var orders []*GetAfsOrdersResult
 	db := dao.GetDB()
 	txDB, _ := dao.Begin(db)
 	defer func() {
diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go
index b62b0d1c7..638505418 100644
--- a/business/jxstore/cms/user2.go
+++ b/business/jxstore/cms/user2.go
@@ -200,6 +200,7 @@ func RegisterUserWithMobile(ctx *jxcontext.Context, user *model.User, mobileVeri
 	if inAuthInfo != nil {
 		if inAuthInfo.AuthBindInfo.Type == dingding.AuthTypeStaff {
 			user.Type |= model.UserTypeOperator
+			user.Type |= model.UserTypeRole
 		} else if user.Mobile != nil {
 			user.Type |= model.UserTypeStoreBoss
 		}