From e22cd59b60d96fd174aadc1335f00973b6e6917a Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 25 Mar 2019 22:27:52 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E4=B8=89=E6=96=B9=E8=BF=90=E5=8D=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=A6=E7=BB=86=E7=9A=84=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/delivery/dada/waybill.go | 4 ++-- business/partner/delivery/mtps/waybill.go | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go index 5c008f6d8..6f580d9b9 100644 --- a/business/partner/delivery/dada/waybill.go +++ b/business/partner/delivery/dada/waybill.go @@ -126,8 +126,8 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy func(del if billParams.CityCode, err = c.getDataCityCodeFromOrder(order, db); err == nil { billParams.ReceiverLng, billParams.ReceiverLat, _ = jxutils.IntCoordinate2MarsStandard(order.ConsigneeLng, order.ConsigneeLat, order.CoordinateType) addParams := map[string]interface{}{ - "info": utils.FilterMb4(order.BuyerComment), - // "origin_mark": model.VendorChineseNames[order.VendorID], + "info": utils.FilterMb4(order.BuyerComment), + "origin_mark": model.VendorChineseNames[order.VendorID], "origin_mark_no": fmt.Sprintf("%d", order.OrderSeq), "cargo_type": 13, "cargo_weight": jxutils.IntWeight2Float(limitOrderWeight(order.Weight)), diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index 6c942ed79..b585759da 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -160,7 +160,12 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy func(del item.GoodCount += goodItem.GoodCount } } - addParams := utils.Params2Map("note", utils.FilterMb4(order.BuyerComment), "goods_detail", string(utils.MustMarshal(goods)), "poi_seq", fmt.Sprintf("#%d", order.OrderSeq)) + addParams := map[string]interface{}{ + "note": utils.FilterMb4(order.BuyerComment), + "goods_detail": string(utils.MustMarshal(goods)), + "goods_pickup_info": fmt.Sprintf("%s第%d号单", model.VendorChineseNames[order.VendorID], order.OrderSeq), + "poi_seq": fmt.Sprintf("#%d", order.OrderSeq), + } result, err2 := api.MtpsAPI.CreateOrderByShop(billParams, addParams) if err = err2; err != nil { globals.SugarLogger.Debugf("CreateWaybill failed, orderID:%s, billParams:%v, addParams:%v, error:%v", order.VendorOrderID, billParams, addParams, err)