From 314c52aff2c0b8d51535fc29d2a66aa5c228244f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 2 Nov 2022 19:16:22 +0800 Subject: [PATCH 1/4] 1 --- business/partner/delivery/dada/waybill.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go index 18ea9b550..3bdac8960 100644 --- a/business/partner/delivery/dada/waybill.go +++ b/business/partner/delivery/dada/waybill.go @@ -67,6 +67,7 @@ func (c *DeliveryHandler) OnWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaap } func (c *DeliveryHandler) onWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaapi.CallbackResponse) { + globals.SugarLogger.Debugf("onWaybillMsg=================:%s", utils.Format4Output(msg, false)) order := c.callbackMsg2Waybill(msg) switch msg.OrderStatus { case dadaapi.OrderStatusWaitingForAccept: From 04cd4c2b86fc83e4b220df3e64b6ca4031ac4fff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 2 Nov 2022 19:27:17 +0800 Subject: [PATCH 2/4] 1 --- business/partner/delivery/dada/waybill.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go index 3bdac8960..ff5d6beb3 100644 --- a/business/partner/delivery/dada/waybill.go +++ b/business/partner/delivery/dada/waybill.go @@ -71,10 +71,12 @@ func (c *DeliveryHandler) onWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaap order := c.callbackMsg2Waybill(msg) switch msg.OrderStatus { case dadaapi.OrderStatusWaitingForAccept: - if dadaOrder, err := api.DadaAPI.QueryOrderInfo(msg.OrderID); err == nil { + dadaOrder, err := api.DadaAPI.QueryOrderInfo(msg.OrderID) + if err == nil { order.ActualFee = jxutils.StandardPrice2Int(dadaOrder.ActualFee) order.DesiredFee = jxutils.StandardPrice2Int(dadaOrder.DeliveryFee) } + globals.SugarLogger.Debugf("onWaybillMsg====dadaOrder=============:%s", utils.Format4Output(dadaOrder, false)) order.Status = model.WaybillStatusNew case dadaapi.OrderStatusAccepted: order.Status = model.WaybillStatusCourierAssigned @@ -440,6 +442,8 @@ func (c *DeliveryHandler) GetRidderPosition(ctx *jxcontext.Context, vendorOrgCod // 获取骑手信息(订单详情) func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeisongId string) (rider *mtpsapi.RiderInfo, err error) { order, err := api.DadaAPI.QueryOrderInfo(orderId) + globals.SugarLogger.Debugf("order111111111111 := %s", utils.Format4Output(order, false)) + globals.SugarLogger.Debugf("order111111111111 := %s", utils.Format4Output(err, false)) if err != nil { return nil, err } From ffc2a7ea5dbea4c12cbde923a00bf05569dceed0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 2 Nov 2022 19:47:35 +0800 Subject: [PATCH 3/4] 1 --- business/partner/delivery/rider.go | 1 + business/partner/purchase/tiktok_store/order.go | 2 ++ 2 files changed, 3 insertions(+) diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 1fb83fefd..fa283b8e5 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -84,6 +84,7 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) { } riderInfo.ThirdCarrierOrderId = v.VendorWaybillID + globals.SugarLogger.Debugf("=============================caoniam= %s", utils.Format4Output(riderInfo, false)) switch riderInfo.LogisticsStatus { case 5: // 呼叫骑手 riderInfo.LogisticsStatus = 0 diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go index 0addc913b..3182667db 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -188,6 +188,8 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s latestReceiptTime := order.ExpectedDeliveredTime h, m, _ := latestReceiptTime.Clock() + globals.SugarLogger.Debugf("===========latestReceiptTime %s,---%d", latestReceiptTime, latestReceiptTime.Day()) + globals.SugarLogger.Debugf("===========latestReceiptTime %d%d", h, m) if latestReceiptTime.Day() == time.Now().Day() && utils.Str2Int16(fmt.Sprintf("%d%d", h, m)) >= openTime && utils.Str2Int16(fmt.Sprintf("%d%d", h, m)) < closeTime && localStore.Status == model.StoreStatusOpened { order.BusinessType = model.BusinessTypeDingshida } else { From 4c1116bb8b9798d137c35136ffcc042aa5e954c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 3 Nov 2022 09:23:55 +0800 Subject: [PATCH 4/4] 1 --- business/partner/delivery/rider.go | 3 +-- business/partner/purchase/tiktok_store/order.go | 8 ++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index fa283b8e5..0cd64ba43 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -77,14 +77,13 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) { } if riderInfo == nil || (riderInfo.CourierName == "" && v.WaybillVendorID == -1 && v.DeliveryType == "store") { // 真商家自送 riderInfo.OrderId = v.VendorOrderID - riderInfo.LogisticsStatus = v.Status + riderInfo.LogisticsStatus = 5 riderInfo.CourierName = "石锋" riderInfo.CourierPhone = "18048531223" riderInfo.LogisticsProviderCode = "10017" } riderInfo.ThirdCarrierOrderId = v.VendorWaybillID - globals.SugarLogger.Debugf("=============================caoniam= %s", utils.Format4Output(riderInfo, false)) switch riderInfo.LogisticsStatus { case 5: // 呼叫骑手 riderInfo.LogisticsStatus = 0 diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go index 3182667db..4a85c8b6e 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -186,15 +186,11 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s closeTime = localStore.CloseTime2 } - latestReceiptTime := order.ExpectedDeliveredTime - h, m, _ := latestReceiptTime.Clock() - globals.SugarLogger.Debugf("===========latestReceiptTime %s,---%d", latestReceiptTime, latestReceiptTime.Day()) - globals.SugarLogger.Debugf("===========latestReceiptTime %d%d", h, m) - if latestReceiptTime.Day() == time.Now().Day() && utils.Str2Int16(fmt.Sprintf("%d%d", h, m)) >= openTime && utils.Str2Int16(fmt.Sprintf("%d%d", h, m)) < closeTime && localStore.Status == model.StoreStatusOpened { + h, m, _ := order.ExpectedDeliveredTime.Clock() + if order.ExpectedDeliveredTime.Day() == time.Now().Day() && utils.Str2Int16(fmt.Sprintf("%d%d", h, m)) >= openTime && utils.Str2Int16(fmt.Sprintf("%d%d", h, m)) < closeTime && localStore.Status == model.StoreStatusOpened { order.BusinessType = model.BusinessTypeDingshida } else { order.BusinessType = model.BusinessTypeImmediate - } // 用户保密信息脱敏