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 17:46:53 +08:00
parent 4d61ede7cc
commit c15585543a
1 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -312,8 +312,8 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
afsInfo[v.SkuID].Count -= minus afsInfo[v.SkuID].Count -= minus
} }
} }
if v.SkuCount2 > 0 { if v.SkuCount2 == 1 {
skuStr := strings.Join([]string{ skuStr1 := strings.Join([]string{
utils.Int2Str(v.SkuID), utils.Int2Str(v.SkuID),
utils.Int2Str(v.SkuCount2), utils.Int2Str(v.SkuCount2),
utils.Int2Str(v.SkuShopPrice), utils.Int2Str(v.SkuShopPrice),
@@ -324,15 +324,16 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
order = v order = v
v.CourierVendorName = model.VendorChineseNames[v.WaybillVendorID] v.CourierVendorName = model.VendorChineseNames[v.WaybillVendorID]
v.Status2 = model.OrderStatusName[v.Status] v.Status2 = model.OrderStatusName[v.Status]
v.SkuInfo = skuStr v.SkuInfo = skuStr1
v.SkuInfo2 = skuStr1
orders2 = append(orders2, v) orders2 = append(orders2, v)
} else { } else {
order.SkuInfo += ";" + skuStr order.SkuInfo += ";" + skuStr1
order.SkuInfo2 += ";" + skuStr1
} }
} } else if v.SkuCount2 > 1 {
if v.SkuCount2 > 1 {
if v.SkuEarningPrice != 0 { if v.SkuEarningPrice != 0 {
skuStr := strings.Join([]string{ skuStr2 := strings.Join([]string{
utils.Int2Str(v.SkuID), utils.Int2Str(v.SkuID),
utils.Int2Str(1), utils.Int2Str(1),
utils.Int2Str(v.SkuShopPrice), utils.Int2Str(v.SkuShopPrice),
@@ -345,7 +346,7 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
} else { } else {
price = v.SkuSalePrice price = v.SkuSalePrice
} }
skuStr2 := strings.Join([]string{ skuStr3 := strings.Join([]string{
utils.Int2Str(v.SkuID), utils.Int2Str(v.SkuID),
utils.Int2Str(v.SkuCount2 - 1), utils.Int2Str(v.SkuCount2 - 1),
utils.Int2Str(v.SkuShopPrice), utils.Int2Str(v.SkuShopPrice),
@@ -356,10 +357,29 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
order = v order = v
v.CourierVendorName = model.VendorChineseNames[v.WaybillVendorID] v.CourierVendorName = model.VendorChineseNames[v.WaybillVendorID]
v.Status2 = model.OrderStatusName[v.Status] v.Status2 = model.OrderStatusName[v.Status]
v.SkuInfo2 = skuStr + ";" + skuStr2 v.SkuInfo2 = skuStr2 + ";" + skuStr3
orders2 = append(orders2, v) orders2 = append(orders2, v)
} else { } else {
order.SkuInfo2 += skuStr + ";" + skuStr2 + ";" order.SkuInfo2 += ";" + skuStr2 + ";" + skuStr3
}
} else {
skuStr1 := strings.Join([]string{
utils.Int2Str(v.SkuID),
utils.Int2Str(v.SkuCount2),
utils.Int2Str(v.SkuShopPrice),
utils.Int2Str(v.SkuSalePrice),
utils.Int2Str(v.SkuEarningPrice),
}, ",")
if order == nil || v.ID != order.ID {
order = v
v.CourierVendorName = model.VendorChineseNames[v.WaybillVendorID]
v.Status2 = model.OrderStatusName[v.Status]
v.SkuInfo = skuStr1
v.SkuInfo2 = skuStr1
orders2 = append(orders2, v)
} else {
order.SkuInfo += ";" + skuStr1
order.SkuInfo2 += ";" + skuStr1
} }
} }
} }