From 52ae2696ab11815b7f0e0cae7f0b731cc4abf8b4 Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 14 Jun 2019 10:25:07 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0courierVendorName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/orderman/orderman_ext.go | 2 ++ business/model/api.go | 1 + 2 files changed, 3 insertions(+) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index da6306293..36ffee5f8 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -419,6 +419,7 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS }, ",") if order == nil || v.ID != order.ID { order = v + v.CourierVendorName = model.VendorChineseNames[v.WaybillVendorID] v.Status2 = model.OrderStatusName[v.Status] v.SkuInfo = skuStr orders2 = append(orders2, v) @@ -453,6 +454,7 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS "waybillVendorID", "orderCreatedAt", "orderFinishedAt", + "courierVendorName", "courierName", "courierMobile", "courierMobile", diff --git a/business/model/api.go b/business/model/api.go index ce17d9a5f..1a0deb8c4 100644 --- a/business/model/api.go +++ b/business/model/api.go @@ -16,6 +16,7 @@ type GoodsOrderExt struct { CourierName string `orm:"size(32)" json:"courierName"` CourierMobile string `orm:"size(32)" json:"courierMobile"` CurrentConsigneeMobile string `orm:"-" json:"currentConsigneeMobile"` + CourierVendorName string `json:"courierVendorName"` Status2 string `json:"status2"` ActualFee int64 `json:"actualFee"` // 实际要支付给快递公司的费用