From 9cf6125a03100e1513439358c59742ac76a65540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 30 Nov 2023 16:22:33 +0800 Subject: [PATCH] 1 --- business/partner/delivery/dada/waybill.go | 2 +- business/partner/delivery/fn/waybill.go | 2 +- business/partner/delivery/rider.go | 4 ++++ business/partner/purchase/tiktok_store/order.go | 13 ++++++++----- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go index 27f47444b..e9b22b19a 100644 --- a/business/partner/delivery/dada/waybill.go +++ b/business/partner/delivery/dada/waybill.go @@ -132,7 +132,7 @@ func (c *DeliveryHandler) onWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaap func tiktokStatusPush(order *model.Waybill, status int, lng, lat string) { result := &utils.RiderInfo{ OrderId: order.VendorOrderID, - ThirdCarrierOrderId: order.VendorWaybillID, + ThirdCarrierOrderId: order.VendorOrderID, CourierName: order.CourierName, CourierPhone: order.CourierMobile, LogisticsStatus: order.Status, diff --git a/business/partner/delivery/fn/waybill.go b/business/partner/delivery/fn/waybill.go index 2d16e7ad2..eec4deacf 100644 --- a/business/partner/delivery/fn/waybill.go +++ b/business/partner/delivery/fn/waybill.go @@ -325,7 +325,7 @@ func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify, resultParam *fnpsapi.ShortSta func tiktokStatusPush(order *model.Waybill, orderStatus int64, lng, lat string) { result := &utils.RiderInfo{ OrderId: order.VendorOrderID, - ThirdCarrierOrderId: order.VendorWaybillID, + ThirdCarrierOrderId: order.VendorOrderID, CourierName: order.CourierName, CourierPhone: order.CourierMobile, LogisticsStatus: order.Status, diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index dbf2cd6c7..9d4d6a748 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -199,6 +199,7 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) { if riderInfo.OrderId == "" { riderInfo.OrderId = v.VendorOrderID + // 10001-顺丰, 10002-达达, 10003-闪送, 10004-蜂鸟, 10005 UU跑腿,10006 快跑者, 10007 极客快送,10008-点我达,10009 同达, 10010-生活半径,10011 邻趣,10012 趣送, 10013 快服务 10014 菜鸟新配盟 10015 商家自建配送 10016 风先生,10017-其他,10032-美团跑腿。 riderInfo.LogisticsProviderCode = "10017" } @@ -229,6 +230,8 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) { case model.VendorIDWSC: // 微盟微商城 continue case model.VendorIDDD: // 抖店小时达 + riderInfo.LogisticsProviderCode = utils.JxVendorId2TiktokCode(v.WaybillVendorID) + riderInfo.ThirdCarrierOrderId = v.VendorOrderID if handler := partner.GetPurchaseOrderHandlerFromVendorID(v.VendorID); handler != nil { if err := handler.GetOrderRider(v.VendorOrgCode, v.VendorStoreID, utils.Struct2Map(riderInfo, "", true)); err != nil { globals.SugarLogger.Debugf("Error pushing meituan rider information :%s--%s--%v", v.VendorOrderID, utils.Format4Output(riderInfo, false), err) @@ -436,6 +439,7 @@ func UpdateFakeWayBillToTiktok() { if riderInfo.LogisticsContext != model.RiderGetOrderDeliverFailed && riderInfo.LogisticsContext != model.RiderGetOrderDeliverOther && riderInfo.LogisticsContext != model.RiderWaitRider { riderInfo.LogisticsContext = fmt.Sprintf(riderInfo.LogisticsContext, riderInfo.CourierName, riderInfo.CourierPhone) } + riderInfo.LogisticsProviderCode = utils.JxVendorId2TiktokCode(fakeWayBill[i].WaybillVendorID) // 推送骑手信息 paramsMap := utils.Struct2Map(riderInfo, "", true) diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go index 04b8b8347..511692df7 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -633,7 +633,7 @@ func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam param := &order_logisticsAdd_request.OrderLogisticsAddParam{ OrderId: order.VendorOrderID, Company: "", - CompanyCode: "chengdouruoxi", + CompanyCode: "", LogisticsCode: order.VendorOrderID, IsRefundReject: false, IsRejectRefund: false, @@ -641,6 +641,7 @@ func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam AddressId: 0, StoreId: utils.Str2Int64(order.VendorStoreID), } + param.CompanyCode = utils.JxVendorId2TiktokCode(order.WaybillVendorID) err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderDelivering(param) if err != nil { return err @@ -651,7 +652,7 @@ func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam ThirdCarrierOrderId: order.VendorOrderID, CourierName: "", CourierPhone: "", - LogisticsProviderCode: "10002", + LogisticsProviderCode: param.CompanyCode, LogisticsStatus: 0, LogisticsContext: "呼叫骑手,新建运单", Latitude: "", @@ -669,13 +670,14 @@ func (c *PurchaseHandler) SelfDeliverDelivered(order *model.GoodsOrder, userName ThirdCarrierOrderId: order.VendorOrderID, CourierName: "", CourierPhone: "", - LogisticsProviderCode: utils.MyselfPsCode, + LogisticsProviderCode: "", LogisticsStatus: 0, LogisticsContext: "商家自配送,已送达", - Latitude: "", - Longitude: "", + Latitude: utils.Float64ToStr(jxutils.IntCoordinate2Standard(order.ConsigneeLat)), + Longitude: utils.Float64ToStr(jxutils.IntCoordinate2Standard(order.ConsigneeLng)), OpCode: tiktokShop.TiktokLogisticsDELIVERED, } + riderInfo.LogisticsProviderCode = utils.JxVendorId2TiktokCode(order.WaybillVendorID) bills, _ := dao.GetWaybills(dao.GetDB(), order.VendorOrderID, nil) for _, v := range bills { if v.Status == model.OrderStatusCanceled { @@ -684,6 +686,7 @@ func (c *PurchaseHandler) SelfDeliverDelivered(order *model.GoodsOrder, userName riderInfo.CourierName = v.CourierName riderInfo.CourierPhone = v.CourierMobile } + riderInfo.LogisticsProviderCode = utils.JxVendorId2TiktokCode(order.WaybillVendorID) return c.GetOrderRider("", "", utils.Struct2MapByJson(riderInfo)) }