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

Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
richboo111
2022-11-02 16:37:59 +08:00
parent 3e32ffeba5 46f5f58586
commit eeaa6179cf
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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