From 584fb59c20d88a50c028d2ba79170497c2e606aa 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 16:11:28 +0800 Subject: [PATCH] 1 --- .../partner/purchase/tiktok_store/order.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go index 840fe33eb..291c3db4e 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -91,7 +91,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s StoreID: 0, CoordinateType: model.CoordinateTypeMars, BuyerComment: result.BuyerWords, - ExpectedDeliveredTime: getTimeFromTimestamp(utils.Interface2Int64WithDefault(result.LatestReceiptTime, 0)), // 预计最晚送达时间 + ExpectedDeliveredTime: getTimeFromTimestamp(result.EarliestReceiptTime + 30*60), // 预计最晚送达时间 PickDeadline: utils.DefaultTimeValue, VendorStatus: utils.Int64ToStr(result.OrderStatus), //1待支付/103部分支付/105已支付/2备货中/101部分发货/3已发货/4取消/完成/21发货前退款完成/22发货后退款/39收货后退款 OrderSeq: 0, @@ -183,18 +183,18 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s return nil, nil, err } // 订单不在门店营业时间来的订单, - //openTime := localStore.OpenTime1 // 门店开始营业时间 - //closeTime := localStore.CloseTime1 // 门店结束营业时间 - //if localStore.CloseTime2 != 0 { - // closeTime = localStore.CloseTime2 - //} + openTime := localStore.OpenTime1 // 门店开始营业时间 + closeTime := localStore.CloseTime1 // 门店结束营业时间 + if localStore.CloseTime2 != 0 { + closeTime = localStore.CloseTime2 + } - latestReceiptTime := utils.Timestamp2Time(result.LatestReceiptTime) - //h, m, _ := latestReceiptTime.Clock() - 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.BusinessTypeImmediate - } else { + latestReceiptTime := order.ExpectedDeliveredTime + h, m, _ := latestReceiptTime.Clock() + 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 { + order.BusinessType = model.BusinessTypeImmediate }