aa

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() {

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
 		}