liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
苏尹岚
2021-04-13 14:03:11 +08:00
parent d56f4ab906
commit 4f7fd9f1e2
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
business/jxcallback/orderman/orderman_ext.go
View File

@@ -923,6 +923,11 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
return saleInfoList, err 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) { 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") globals.SugarLogger.Debugf("GetAfsOrders")
//权限 //权限
@@ -1036,7 +1041,7 @@ func (c *OrderManager) GetAfsOrders(ctx *jxcontext.Context, keyword, afsOrderID,
` `
sqlParams = append(sqlParams, pageSize, offset) sqlParams = append(sqlParams, pageSize, offset)
var orders []*model.AfsOrder var orders []*GetAfsOrdersResult
db := dao.GetDB() db := dao.GetDB()
txDB, _ := dao.Begin(db) txDB, _ := dao.Begin(db)
defer func() { defer func() {

1
business/jxstore/cms/user2.go
View File

@@ -200,6 +200,7 @@ func RegisterUserWithMobile(ctx *jxcontext.Context, user *model.User, mobileVeri
if inAuthInfo != nil { if inAuthInfo != nil {
if inAuthInfo.AuthBindInfo.Type == dingding.AuthTypeStaff { if inAuthInfo.AuthBindInfo.Type == dingding.AuthTypeStaff {
user.Type |= model.UserTypeOperator user.Type |= model.UserTypeOperator
user.Type |= model.UserTypeRole
} else if user.Mobile != nil { } else if user.Mobile != nil {
user.Type |= model.UserTypeStoreBoss user.Type |= model.UserTypeStoreBoss
} }