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