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-07-22 10:02:17 +08:00
parent 10cdff2b11
commit df8db16e0d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -229,7 +229,7 @@ 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 {
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。")) 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

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

@@ -104,7 +104,8 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m
globals.SugarLogger.Warnf("onWaybillMsg unknown msg:%v", msg) globals.SugarLogger.Warnf("onWaybillMsg unknown msg:%v", msg)
return mtpsapi.SuccessResponse return mtpsapi.SuccessResponse
} }
order2, _ := dao.GetSimpleOrder(dao.GetDB(), order.VendorOrderID) order2, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.OrderVendorID)
// order2, _ := dao.GetSimpleOrder(dao.GetDB(), order.VendorOrderID)
//查不到订单可能就是果园的订单 //查不到订单可能就是果园的订单
if order2 == nil { if order2 == nil {
c.pushToGy(msg) c.pushToGy(msg)
@@ -236,7 +237,7 @@ 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),
// } // }
billParams.Note = utils.FilterMb4(order.BuyerComment + "，取货失败请联系18048531223。") 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)