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-08-06 09:46:53 +08:00
parent 90418dc7e9
commit 1b08386fe9
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
business/partner/delivery/dada/waybill.go
View File

@@ -228,14 +228,14 @@ func (c *DeliveryHandler) getBillParams(db *dao.DaoDB, order *model.GoodsOrder)
} }
if billParams.ShopNo, err = c.getDadaShopID(order, db); err == nil { if billParams.ShopNo, err = c.getDadaShopID(order, db); err == nil {
if billParams.CityCode, err = c.getDataCityCodeFromOrder(order, db); err == nil { if billParams.CityCode, err = c.getDataCityCodeFromOrder(order, db); err == nil {
storeTel := "" // storeTel := ""
storeID := jxutils.GetSaleStoreIDFromOrder(order) // storeID := jxutils.GetSaleStoreIDFromOrder(order)
storeDeatail, _ := dao.GetStoreDetail(db, storeID, order.VendorID) // storeDeatail, _ := dao.GetStoreDetail(db, storeID, order.VendorID)
if storeDeatail.Tel2 != "" { // if storeDeatail.Tel2 != "" {
storeTel = ",门店电话：" + storeDeatail.Tel2 // storeTel = ",门店电话：" + storeDeatail.Tel2
} // }
billParams.ReceiverLng, billParams.ReceiverLat, _ = jxutils.IntCoordinate2MarsStandard(order.ConsigneeLng, order.ConsigneeLat, order.CoordinateType) 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"+storeTel)) billParams.Info = fmt.Sprintf("%s第%d号订单, %s", model.VendorChineseNames[order.VendorID], order.OrderSeq, utils.FilterMb4(order.BuyerComment+"取货失败或配送遇到问题请联系18048531223，禁止未配送直接完成定单！"))
billParams.CargoType = dadaapi.CargoTypeFresh billParams.CargoType = dadaapi.CargoTypeFresh
billParams.CargoWeight = float64(jxutils.IntWeight2Float(limitOrderWeight(order.Weight))) billParams.CargoWeight = float64(jxutils.IntWeight2Float(limitOrderWeight(order.Weight)))
billParams.CargoNum = order.GoodsCount billParams.CargoNum = order.GoodsCount

14
business/partner/delivery/mtps/waybill.go
View File

@@ -238,13 +238,13 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
// "goods_pickup_info": fmt.Sprintf("%s第%d号单", model.VendorChineseNames[order.VendorID], order.OrderSeq), // "goods_pickup_info": fmt.Sprintf("%s第%d号单", model.VendorChineseNames[order.VendorID], order.OrderSeq),
// "poi_seq": fmt.Sprintf("#%d", order.OrderSeq), // "poi_seq": fmt.Sprintf("#%d", order.OrderSeq),
// } // }
storeTel := "" // storeTel := ""
storeID := jxutils.GetSaleStoreIDFromOrder(order) // storeID := jxutils.GetSaleStoreIDFromOrder(order)
storeDeatail, _ := dao.GetStoreDetail(db, storeID, order.VendorID) // storeDeatail, _ := dao.GetStoreDetail(db, storeID, order.VendorID)
if storeDeatail.Tel2 != "" { // if storeDeatail.Tel2 != "" {
storeTel = ",门店电话：" + storeDeatail.Tel2 // storeTel = ",门店电话：" + storeDeatail.Tel2
} // }
billParams.Note = utils.FilterMb4(order.BuyerComment + "，取货失败请联系平台电话：18048531223" + storeTel) billParams.Note = utils.FilterMb4(order.BuyerComment + "，取货失败或配送遇到问题请联系18048531223，禁止未配送直接完成定单！")
billParams.GoodsDetail = string(utils.MustMarshal(goods)) billParams.GoodsDetail = string(utils.MustMarshal(goods))
billParams.GoodsPickupInfo = fmt.Sprintf("%s第%d号单", model.VendorChineseNames[order.VendorID], order.OrderSeq) billParams.GoodsPickupInfo = fmt.Sprintf("%s第%d号单", model.VendorChineseNames[order.VendorID], order.OrderSeq)
billParams.PoiSeq = fmt.Sprintf("#%d", order.OrderSeq) billParams.PoiSeq = fmt.Sprintf("#%d", order.OrderSeq)