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

Merge remote-tracking branch 'origin/mark' into yonghui

Browse Source
This commit is contained in:
苏尹岚
2019-11-29 14:35:36 +08:00
parent 595572ef14 a4cdd45487
commit b4db130c5e
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,8 +242,7 @@ 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) { 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) globals.SugarLogger.Debugf("ExportOrders from:%s to:%s", fromDateStr, toDateStr)
var ( var (
orders, orders2 []*model.GoodsOrderExt orders []*model.GoodsOrderExt
order *model.GoodsOrderExt
afsSkuMap map[string]map[int]*model.OrderSkuFinancial afsSkuMap map[string]map[int]*model.OrderSkuFinancial
excelBin []byte excelBin []byte
) )
@@ -252,9 +251,12 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
switch step { switch step {
case 0: case 0:
orders, _, err = dao.GetOrders(dao.GetDB(), nil, true, true, fromDateStr, toDateStr, true, nil, false, "", mapParams, 0, model.UnlimitedPageSize) 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: case 1:
afsSkuMap, err = c.getAfsOrderSkuInfo4ExportOrders(ctx, fromDateStr, toDateStr) afsSkuMap, err = c.getAfsOrderSkuInfo4ExportOrders(ctx, fromDateStr, toDateStr)
case 2: case 2:
var order *model.GoodsOrderExt
var orders2 []*model.GoodsOrderExt
for _, v := range orders { for _, v := range orders {
if afsInfo := afsSkuMap[jxutils.ComposeUniversalOrderID(v.VendorOrderID, v.VendorID)]; afsInfo != nil { if afsInfo := afsSkuMap[jxutils.ComposeUniversalOrderID(v.VendorOrderID, v.VendorID)]; afsInfo != nil {
if afsInfo[v.SkuID] != nil && afsInfo[v.SkuID].Count > 0 { 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: case 3:
excelConf := &excel.Obj2ExcelSheetConfig{ excelConf := &excel.Obj2ExcelSheetConfig{
Title: "订单导出", Title: "订单导出",
Data: orders2, Data: orders,
CaptionList: []string{ CaptionList: []string{
"vendorOrderID", "vendorOrderID",
"vendorOrderID2", "vendorOrderID2",