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-01-21 17:49:59 +08:00
parent ada312f753
commit f85fa9e12a
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/model/dao/dao_order.go
View File

@@ -904,6 +904,12 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
sqlParams = append(sqlParams, lockStatuss) sqlParams = append(sqlParams, lockStatuss)
} }
} }
if params["brandID"] != nil {
if utils.MustInterface2Int64(params["brandID"]) != 0 {
sqlWhere += " AND t5.brand_id = ?"
sqlParams = append(sqlParams, utils.MustInterface2Int64(params["brandID"]))
}
}
if params["cities"] != nil { if params["cities"] != nil {
var cities []int var cities []int
if err = utils.UnmarshalUseNumber([]byte(params["cities"].(string)), &cities); err != nil { if err = utils.UnmarshalUseNumber([]byte(params["cities"].(string)), &cities); err != nil {

4
business/model/dao/permission.go
View File

@@ -110,3 +110,7 @@ func GetRoleMenu(db *DaoDB, roleIDs, menuIDs []int) (roleMenus []*model.RoleMenu
err = GetRows(db, &roleMenus, sql, sqlParams) err = GetRows(db, &roleMenus, sql, sqlParams)
return roleMenus, err return roleMenus, err
} }
func GetUserStores(db *DaoDB, userID string) {
}

1
controllers/jx_order.go
View File

@@ -296,6 +296,7 @@ func (c *OrderController) ExportMTWaybills() {
// @Param skuIDs query string false "包含的skuID列表，或的关系" // @Param skuIDs query string false "包含的skuID列表，或的关系"
// @Param isJxFirst query bool false "排序是否京西订单优先（缺省为否）" // @Param isJxFirst query bool false "排序是否京西订单优先（缺省为否）"
// @Param adjustCount query int false "最小调整次数" // @Param adjustCount query int false "最小调整次数"
// @Param brandID query int false "品牌ID"
// @Param mustInvoice query bool false "是否必须要求开发票" // @Param mustInvoice query bool false "是否必须要求开发票"
// @Param offset query int false "结果起始序号（以0开始，缺省为0）" // @Param offset query int false "结果起始序号（以0开始，缺省为0）"
// @Param pageSize query int false "结果页大小（缺省为50，-1表示全部）" // @Param pageSize query int false "结果页大小（缺省为50，-1表示全部）"