From 98216f47ec42faf299cd24fb71ab036935567a09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Wed, 22 Jul 2020 17:48:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E6=96=B9=E9=85=8D=E9=80=81=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=A4=87=E6=B3=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/delivery/dada/waybill.go | 8 +++++++- business/partner/delivery/mtps/waybill.go | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go index 6fe680efa..86f6e8308 100644 --- a/business/partner/delivery/dada/waybill.go +++ b/business/partner/delivery/dada/waybill.go @@ -228,8 +228,14 @@ func (c *DeliveryHandler) getBillParams(db *dao.DaoDB, order *model.GoodsOrder) } if billParams.ShopNo, err = c.getDadaShopID(order, db); err == nil { if billParams.CityCode, err = c.getDataCityCodeFromOrder(order, db); err == nil { + storeTel := "" + storeID := jxutils.GetSaleStoreIDFromOrder(order) + storeDeatail, _ := dao.GetStoreDetail(db, storeID, order.VendorID) + if storeDeatail.Tel2 != "" { + storeTel = ",门店电话：" + storeDeatail.Tel2 + } billParams.ReceiverLng, billParams.ReceiverLat, _ = jxutils.IntCoordinate2MarsStandard(order.ConsigneeLng, order.ConsigneeLat, order.CoordinateType) - billParams.Info = fmt.Sprintf("%s第%d号订单, %s", model.VendorChineseNames[order.VendorID], order.OrderSeq, utils.FilterMb4(order.BuyerComment+"，取货失败请联系平台电话：18048531223。")) + billParams.Info = fmt.Sprintf("%s第%d号订单, %s", model.VendorChineseNames[order.VendorID], order.OrderSeq, utils.FilterMb4(order.BuyerComment+"取货失败请联系平台电话：18048531223"+storeTel)) billParams.CargoType = dadaapi.CargoTypeFresh billParams.CargoWeight = float64(jxutils.IntWeight2Float(limitOrderWeight(order.Weight))) billParams.CargoNum = order.GoodsCount diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index b370f1c47..6b814c520 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -237,7 +237,13 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee // "goods_pickup_info": fmt.Sprintf("%s第%d号单", model.VendorChineseNames[order.VendorID], order.OrderSeq), // "poi_seq": fmt.Sprintf("#%d", order.OrderSeq), // } - billParams.Note = utils.FilterMb4(order.BuyerComment + "，取货失败请联系平台电话：18048531223。") + storeTel := "" + storeID := jxutils.GetSaleStoreIDFromOrder(order) + storeDeatail, _ := dao.GetStoreDetail(db, storeID, order.VendorID) + if storeDeatail.Tel2 != "" { + storeTel = ",门店电话：" + storeDeatail.Tel2 + } + billParams.Note = utils.FilterMb4(order.BuyerComment + "，取货失败请联系平台电话：18048531223" + storeTel) billParams.GoodsDetail = string(utils.MustMarshal(goods)) billParams.GoodsPickupInfo = fmt.Sprintf("%s第%d号单", model.VendorChineseNames[order.VendorID], order.OrderSeq) billParams.PoiSeq = fmt.Sprintf("#%d", order.OrderSeq)