From a4cdd45487acc378b4fe944a1a02cd140a280a9a Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 29 Nov 2019 12:07:33 +0800 Subject: [PATCH] up --- business/jxcallback/orderman/orderman_ext.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 50018eb38..f4ea247b6 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -242,19 +242,21 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fro func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateStr string, mapParams map[string]interface{}) (hint string, err error) { globals.SugarLogger.Debugf("ExportOrders from:%s to:%s", fromDateStr, toDateStr) var ( - orders, orders2 []*model.GoodsOrderExt - order *model.GoodsOrderExt - afsSkuMap map[string]map[int]*model.OrderSkuFinancial - excelBin []byte + orders []*model.GoodsOrderExt + afsSkuMap map[string]map[int]*model.OrderSkuFinancial + excelBin []byte ) task := tasksch.NewSeqTask("导出订单SKU信息", ctx, func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { switch step { case 0: orders, _, err = dao.GetOrders(dao.GetDB(), nil, true, true, fromDateStr, toDateStr, true, nil, false, "", mapParams, 0, model.UnlimitedPageSize) + globals.SugarLogger.Debugf("orders:%d, er:%v", len(orders), err) case 1: afsSkuMap, err = c.getAfsOrderSkuInfo4ExportOrders(ctx, fromDateStr, toDateStr) case 2: + var order *model.GoodsOrderExt + var orders2 []*model.GoodsOrderExt for _, v := range orders { if afsInfo := afsSkuMap[jxutils.ComposeUniversalOrderID(v.VendorOrderID, v.VendorID)]; afsInfo != nil { if afsInfo[v.SkuID] != nil && afsInfo[v.SkuID].Count > 0 { @@ -285,10 +287,11 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS } } } + orders = orders2 case 3: excelConf := &excel.Obj2ExcelSheetConfig{ Title: "订单导出", - Data: orders2, + Data: orders, CaptionList: []string{ "vendorOrderID", "vendorOrderID2",