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

GetOrders添加可选参数isJxFirst

Browse Source
This commit is contained in:
gazebo
2019-10-08 14:35:09 +08:00
parent 34506d08a9
commit 38cad2db49
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -228,7 +228,7 @@ func (c *OrderManager) ExportMTWaybills(ctx *jxcontext.Context, fromDateStr, toD
return nil, err return nil, err
} }
func (c *OrderManager) getOrders(ctx *jxcontext.Context, isIncludeSku, isIncludeFake bool, fromDateStr, toDateStr string, isDateFinish bool, skuIDs []int, params map[string]interface{}, offset, pageSize int) (orders []*model.GoodsOrderExt, totalCount int, err error) { func (c *OrderManager) getOrders(ctx *jxcontext.Context, isIncludeSku, isIncludeFake bool, fromDateStr, toDateStr string, isDateFinish bool, skuIDs []int, isJxFirst bool, params map[string]interface{}, offset, pageSize int) (orders []*model.GoodsOrderExt, totalCount int, err error) {
globals.SugarLogger.Debugf("getOrders from:%s to:%s", fromDateStr, toDateStr) globals.SugarLogger.Debugf("getOrders from:%s to:%s", fromDateStr, toDateStr)
pageSize = jxutils.FormalizePageSize(pageSize) pageSize = jxutils.FormalizePageSize(pageSize)
@@ -393,8 +393,15 @@ func (c *OrderManager) getOrders(ctx *jxcontext.Context, isIncludeSku, isInclude
sql += ` sql += `
ORDER BY t1.id` ORDER BY t1.id`
} else { } else {
if isJxFirst {
sql += `
ORDER BY IF(t1.vendor_id = ?, 0, 1), t1.order_created_at DESC`
sqlParams = append(sqlParams, model.VendorIDJX)
} else {
sql += `
ORDER BY t1.order_created_at DESC`
}
sql += ` sql += `
ORDER BY t1.order_created_at DESC
LIMIT ? OFFSET ?` LIMIT ? OFFSET ?`
sqlParams = append(sqlParams, pageSize, offset) sqlParams = append(sqlParams, pageSize, offset)
@@ -415,9 +422,9 @@ func (c *OrderManager) getOrders(ctx *jxcontext.Context, isIncludeSku, isInclude
return orders, totalCount, err return orders, totalCount, err
} }
func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fromDateStr, toDateStr string, isDateFinish bool, skuIDs []int, params map[string]interface{}, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) { func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fromDateStr, toDateStr string, isDateFinish bool, skuIDs []int, isJxFirst bool, params map[string]interface{}, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
globals.SugarLogger.Debugf("GetOrders from:%s to:%s", fromDateStr, toDateStr) globals.SugarLogger.Debugf("GetOrders from:%s to:%s", fromDateStr, toDateStr)
orders, totalCount, err := c.getOrders(ctx, false, isIncludeFake, fromDateStr, toDateStr, isDateFinish, skuIDs, params, offset, pageSize) orders, totalCount, err := c.getOrders(ctx, false, isIncludeFake, fromDateStr, toDateStr, isDateFinish, skuIDs, isJxFirst, params, offset, pageSize)
if err == nil { if err == nil {
pagedInfo = &model.PagedInfo{ pagedInfo = &model.PagedInfo{
TotalCount: totalCount, TotalCount: totalCount,
@@ -439,7 +446,7 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
switch step { switch step {
case 0: case 0:
orders, _, err = c.getOrders(ctx, true, true, fromDateStr, toDateStr, true, nil, mapParams, 0, -1) orders, _, err = c.getOrders(ctx, true, true, fromDateStr, toDateStr, true, nil, false, mapParams, 0, -1)
case 1: case 1:
afsSkuMap, err = c.getAfsOrderSkuInfo4ExportOrders(ctx, fromDateStr, toDateStr) afsSkuMap, err = c.getAfsOrderSkuInfo4ExportOrders(ctx, fromDateStr, toDateStr)
case 2: case 2:

3
controllers/jx_order.go
View File

@@ -276,6 +276,7 @@ func (c *OrderController) ExportMTWaybills() {
// @Param cities query string false "城市code列表[1,2,3]，缺省不限制" // @Param cities query string false "城市code列表[1,2,3]，缺省不限制"
// @Param isIncludeFake query bool false "是否包括假订单" // @Param isIncludeFake query bool false "是否包括假订单"
// @Param skuIDs query string false "包含的skuID列表，或的关系" // @Param skuIDs query string false "包含的skuID列表，或的关系"
// @Param isJxFirst 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表示全部）"
// @Success 200 {object} controllers.CallResult // @Success 200 {object} controllers.CallResult
@@ -285,7 +286,7 @@ func (c *OrderController) GetOrders() {
c.callGetOrders(func(params *tOrderGetOrdersParams) (retVal interface{}, errCode string, err error) { c.callGetOrders(func(params *tOrderGetOrdersParams) (retVal interface{}, errCode string, err error) {
var skuIDs []int var skuIDs []int
if err = jxutils.Strings2Objs(params.SkuIDs, &skuIDs); err == nil { if err = jxutils.Strings2Objs(params.SkuIDs, &skuIDs); err == nil {
retVal, err = orderman.FixedOrderManager.GetOrders(params.Ctx, params.IsIncludeFake, params.FromDate, params.ToDate, params.IsDateFinish, skuIDs, params.MapData, params.Offset, params.PageSize) retVal, err = orderman.FixedOrderManager.GetOrders(params.Ctx, params.IsIncludeFake, params.FromDate, params.ToDate, params.IsDateFinish, skuIDs, params.IsJxFirst, params.MapData, params.Offset, params.PageSize)
} }
return retVal, "", err return retVal, "", err
}) })