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-14 13:41:07 +08:00
parent 25ca1abdf7
commit 2101a5282e
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -910,12 +910,22 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
sqlParams = append(sqlParams, utils.MustInterface2Int64(params["brandID"]))
}
}
if params["deliveryType"] != nil {
if params["deliveryType"].(string) != "" {
sqlWhere += " AND t1.delivery_type = ?"
sqlParams = append(sqlParams, params["deliveryType"].(string))
if params["deliveryTypes"] != nil {
var deliveryTypes []string
if err = utils.UnmarshalUseNumber([]byte(params["deliveryTypes"].(string)), &deliveryTypes); err != nil {
return nil, 0, err
}
if len(deliveryTypes) > 0 {
sqlWhere += " AND t1.delivery_type IN (" + GenQuestionMarks(len(deliveryTypes)) + ")"
sqlParams = append(sqlParams, deliveryTypes)
}
}
// if params["deliveryType"] != nil {
// if params["deliveryType"].(string) != "" {
// sqlWhere += " AND t1.delivery_type = ?"
// sqlParams = append(sqlParams, params["deliveryType"].(string))
// }
// }
if params["cities"] != nil {
var cities []int
if err = utils.UnmarshalUseNumber([]byte(params["cities"].(string)), &cities); err != nil {

2
controllers/jx_order.go
View File

@@ -298,7 +298,7 @@ func (c *OrderController) ExportMTWaybills() {
// @Param adjustCount query int false "最小调整次数"
// @Param brandID query int false "品牌ID"
// @Param mustInvoice query bool false "是否必须要求开发票"
// @Param deliveryType query string false "配送方式"
// @Param deliveryTypes query string false "配送方式"
// @Param offset query int false "结果起始序号（以0开始，缺省为0）"
// @Param pageSize query int false "结果页大小（缺省为50，-1表示全部）"
// @Success 200 {object} controllers.CallResult