From 5628f86a10b2a4e27c9c275fa7c35fb6e5c4f392 Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 30 Jul 2019 11:55:51 +0800 Subject: [PATCH] =?UTF-8?q?-=20GetOrders=E6=B7=BB=E5=8A=A0=E5=8F=AF?= =?UTF-8?q?=E9=80=89=E5=8F=82=E6=95=B0=EF=BC=9AisDateFinish=20-=20ExportOr?= =?UTF-8?q?ders=E4=BB=A5=E5=AE=8C=E6=88=90=E6=97=B6=E9=97=B4=E6=9D=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/orderman/orderman_ext.go | 19 +++++++++++-------- controllers/jx_order.go | 3 ++- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index cec268570..156531b8c 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -246,7 +246,7 @@ func (c *OrderManager) ExportMTWaybills(ctx *jxcontext.Context, fromDateStr, toD return nil, err } -func (c *OrderManager) getOrders(ctx *jxcontext.Context, isIncludeSku bool, fromDateStr, toDateStr string, params map[string]interface{}, offset, pageSize int) (orders []*model.GoodsOrderExt, totalCount int, err error) { +func (c *OrderManager) getOrders(ctx *jxcontext.Context, isIncludeSku bool, fromDateStr, toDateStr string, isDateFinish 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) pageSize = jxutils.FormalizePageSize(pageSize) @@ -310,10 +310,13 @@ func (c *OrderManager) getOrders(ctx *jxcontext.Context, isIncludeSku bool, from return nil, 0, err } toDate = toDate.Add(24 * time.Hour) - - sqlWhere = ` - WHERE t1.order_created_at >= ? AND t1.order_created_at < ? - ` + if isDateFinish { + sqlWhere = ` + WHERE t1.order_finished_at >= ? AND t1.order_finished_at < ?` + } else { + sqlWhere = ` + WHERE t1.order_created_at >= ? AND t1.order_created_at < ?` + } sqlParams = []interface{}{ fromDate, toDate, @@ -423,9 +426,9 @@ func (c *OrderManager) getOrders(ctx *jxcontext.Context, isIncludeSku bool, from return orders, totalCount, err } -func (c *OrderManager) GetOrders(ctx *jxcontext.Context, fromDateStr, toDateStr string, params map[string]interface{}, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) { +func (c *OrderManager) GetOrders(ctx *jxcontext.Context, fromDateStr, toDateStr string, isDateFinish bool, params map[string]interface{}, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) { globals.SugarLogger.Debugf("GetOrders from:%s to:%s", fromDateStr, toDateStr) - orders, totalCount, err := c.getOrders(ctx, false, fromDateStr, toDateStr, params, offset, pageSize) + orders, totalCount, err := c.getOrders(ctx, false, fromDateStr, toDateStr, isDateFinish, params, offset, pageSize) if err == nil { pagedInfo = &model.PagedInfo{ TotalCount: totalCount, @@ -447,7 +450,7 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { switch step { case 0: - orders, _, err = c.getOrders(ctx, true, fromDateStr, toDateStr, mapParams, 0, -1) + orders, _, err = c.getOrders(ctx, true, fromDateStr, toDateStr, true, mapParams, 0, -1) case 1: afsSkuMap, err = c.getAfsOrderSkuInfo4ExportOrders(ctx, fromDateStr, toDateStr) case 2: diff --git a/controllers/jx_order.go b/controllers/jx_order.go index e64e166f6..af0f6be8f 100644 --- a/controllers/jx_order.go +++ b/controllers/jx_order.go @@ -266,6 +266,7 @@ func (c *OrderController) ExportMTWaybills() { // @Param keyword query string false "查询关键字" // @Param fromDate query string false "开始日期（包含），格式（2006-01-02），如果订单号为空此项必须要求" // @Param toDate query string false "结束日期（包含），格式（2006-01-02），如果订单号为空此项必须要求" +// @Param isDateFinish query bool false "是否fromDate与toDate指的是订单结束日期，缺省不是" // @Param vendorIDs query string false "订单所属厂商列表[1,2,3]，缺省不限制" // @Param waybillVendorIDs query string false "承运人所属厂商列表[1,2,3]，缺省不限制" // @Param storeIDs query string false "京西门店ID列表[1,2,3]，缺省不限制" @@ -279,7 +280,7 @@ func (c *OrderController) ExportMTWaybills() { // @router /GetOrders [get] func (c *OrderController) GetOrders() { c.callGetOrders(func(params *tOrderGetOrdersParams) (retVal interface{}, errCode string, err error) { - retVal, err = orderman.FixedOrderManager.GetOrders(params.Ctx, params.FromDate, params.ToDate, params.MapData, params.Offset, params.PageSize) + retVal, err = orderman.FixedOrderManager.GetOrders(params.Ctx, params.FromDate, params.ToDate, params.IsDateFinish, params.MapData, params.Offset, params.PageSize) return retVal, "", err }) }