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] 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 - } // 用户保密信息脱敏