From 123d9e4a350cf12a62546eee182d378b5e16b296 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Tue, 1 Nov 2022 09:41:07 +0800
Subject: [PATCH] 1

---
 business/partner/delivery/dada/waybill.go       |  5 +++--
 business/partner/delivery/rider.go              |  3 +++
 business/partner/purchase/tiktok_store/order.go | 16 +++++++++-------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go
index 2ac1378d7..d744388c6 100644
--- a/business/partner/delivery/dada/waybill.go
+++ b/business/partner/delivery/dada/waybill.go
@@ -455,8 +455,9 @@ func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeiso
 	}
 
 	switch order.StatusCode {
-	//case 20: // 骑手接单
-	//	result.LogisticsStatus = model.WaybillStatusCourierAssigned
+	case 20: // 骑手接单
+		result.LogisticsStatus = model.WaybillStatusCourierAssigned
+		result.LogisticsContext = model.RiderGetOrder
 	case 100: // 骑手到店
 		result.LogisticsStatus = model.WaybillStatusCourierArrived
 		result.LogisticsContext = model.RiderGetOrder
diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go
index 082ad9588..2f1c41358 100644
--- a/business/partner/delivery/rider.go
+++ b/business/partner/delivery/rider.go
@@ -94,6 +94,9 @@ func GetOrderRiderInfoToPlatform(orderId string) {
 		case 22, 0: // 异常配送
 			riderInfo.LogisticsStatus = 22
 			riderInfo.OpCode = tiktok_api.TiktokLogisticsINDDELIVERYEXCEPTION
+		case 12: // 骑手接单
+			riderInfo.LogisticsStatus = 12
+			riderInfo.OpCode = tiktok_api.TiktokLogisticsORDERRECEIVED
 		default:
 			continue
 		}
diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go
index 1080e08ad..35ed96c17 100644
--- a/business/partner/purchase/tiktok_store/order.go
+++ b/business/partner/purchase/tiktok_store/order.go
@@ -183,13 +183,15 @@ 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
-	}
-	h, m, _ := utils.Timestamp2Time(result.CreateTime).Clock()
-	if utils.Str2Int16(fmt.Sprintf("%d%d", h, m)) >= openTime && utils.Str2Int16(fmt.Sprintf("%d%d", h, m)) < closeTime && localStore.Status == model.StoreStatusOpened {
+	//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 {
 		order.BusinessType = model.BusinessTypeDingshida