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

导出订单增加字段

Browse Source
This commit is contained in:
苏尹岚
2020-04-29 15:32:52 +08:00
parent 21ddced471
commit 00285a58ba
1 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -331,34 +331,36 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
} }
} }
if v.SkuCount2 > 1 { if v.SkuCount2 > 1 {
skuStr := strings.Join([]string{ if v.SkuEarningPrice != 0 {
utils.Int2Str(v.SkuID), skuStr := strings.Join([]string{
utils.Int2Str(v.SkuCount2), utils.Int2Str(v.SkuID),
utils.Int2Str(v.SkuShopPrice), utils.Int2Str(v.SkuCount2),
utils.Int2Str(v.SkuSalePrice), utils.Int2Str(v.SkuShopPrice),
utils.Int2Str(v.SkuEarningPrice), utils.Int2Str(v.SkuSalePrice),
}, ",") utils.Int2Str(v.SkuEarningPrice),
price := 0 }, ",")
if v.SkuShopPrice < v.SkuSalePrice { price := 0
price = v.SkuShopPrice if v.SkuShopPrice < v.SkuSalePrice {
} else { price = v.SkuShopPrice
price = v.SkuSalePrice } else {
} price = v.SkuSalePrice
skuStr2 := strings.Join([]string{ }
utils.Int2Str(v.SkuID), skuStr2 := strings.Join([]string{
utils.Int2Str(v.SkuCount2 - 1), utils.Int2Str(v.SkuID),
utils.Int2Str(v.SkuShopPrice), utils.Int2Str(v.SkuCount2 - 1),
utils.Int2Str(v.SkuSalePrice), utils.Int2Str(v.SkuShopPrice),
utils.Int2Str(price), utils.Int2Str(v.SkuSalePrice),
}, ",") utils.Int2Str(price),
if order == nil || v.ID != order.ID { }, ",")
order = v if order == nil || v.ID != order.ID {
v.CourierVendorName = model.VendorChineseNames[v.WaybillVendorID] order = v
v.Status2 = model.OrderStatusName[v.Status] v.CourierVendorName = model.VendorChineseNames[v.WaybillVendorID]
v.SkuInfo2 = skuStr + ";" + skuStr2 v.Status2 = model.OrderStatusName[v.Status]
orders2 = append(orders2, v) v.SkuInfo2 = skuStr + ";" + skuStr2
} else { orders2 = append(orders2, v)
order.SkuInfo2 += ";" + skuStr + ";" + skuStr2 } else {
order.SkuInfo2 += ";" + skuStr + ";" + skuStr2
}
} }
} else { } else {
order.SkuInfo2 = "" order.SkuInfo2 = ""
@@ -402,6 +404,7 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
"waybillFinishedAt", "waybillFinishedAt",
"status2", "status2",
"skuInfo", "skuInfo",
"skuInfo2",
"waybillTipMoney", "waybillTipMoney",
}, },
} }