liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2022-11-03 09:23:55 +08:00
parent ffc2a7ea5d
commit 4c1116bb8b
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/partner/delivery/rider.go
View File

@@ -77,14 +77,13 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
} }
if riderInfo == nil || (riderInfo.CourierName == "" && v.WaybillVendorID == -1 && v.DeliveryType == "store") { // 真商家自送 if riderInfo == nil || (riderInfo.CourierName == "" && v.WaybillVendorID == -1 && v.DeliveryType == "store") { // 真商家自送
riderInfo.OrderId = v.VendorOrderID riderInfo.OrderId = v.VendorOrderID
riderInfo.LogisticsStatus = v.Status riderInfo.LogisticsStatus = 5
riderInfo.CourierName = "石锋" riderInfo.CourierName = "石锋"
riderInfo.CourierPhone = "18048531223" riderInfo.CourierPhone = "18048531223"
riderInfo.LogisticsProviderCode = "10017" riderInfo.LogisticsProviderCode = "10017"
} }
riderInfo.ThirdCarrierOrderId = v.VendorWaybillID riderInfo.ThirdCarrierOrderId = v.VendorWaybillID
globals.SugarLogger.Debugf("=============================caoniam= %s", utils.Format4Output(riderInfo, false))
switch riderInfo.LogisticsStatus { switch riderInfo.LogisticsStatus {
case 5: // 呼叫骑手 case 5: // 呼叫骑手
riderInfo.LogisticsStatus = 0 riderInfo.LogisticsStatus = 0

8
business/partner/purchase/tiktok_store/order.go
View File

@@ -186,15 +186,11 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
closeTime = localStore.CloseTime2 closeTime = localStore.CloseTime2
} }
latestReceiptTime := order.ExpectedDeliveredTime h, m, _ := order.ExpectedDeliveredTime.Clock()
h, m, _ := latestReceiptTime.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 {
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 order.BusinessType = model.BusinessTypeDingshida
} else { } else {
order.BusinessType = model.BusinessTypeImmediate order.BusinessType = model.BusinessTypeImmediate
} }
// 用户保密信息脱敏 // 用户保密信息脱敏