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:
邹宗楠
2023-02-24 16:58:34 +08:00
parent 58b6200600
commit dda9894bca
1 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,25 +86,24 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
} }
orderMap = result orderMap = result
order = &model.GoodsOrder{ order = &model.GoodsOrder{
VendorOrderID: result.OrderId, VendorOrderID: result.OrderId,
VendorID: model.VendorIDDD, VendorID: model.VendorIDDD,
VendorStoreID: "", VendorStoreID: "",
StoreID: 0, StoreID: 0,
CoordinateType: model.CoordinateTypeMars, CoordinateType: model.CoordinateTypeMars,
BuyerComment: result.BuyerWords, BuyerComment: result.BuyerWords,
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, StatusTime: getTimeFromTimestamp(result.CreateTime),
StatusTime: getTimeFromTimestamp(result.CreateTime), OrderCreatedAt: getTimeFromTimestamp(result.CreateTime),
OrderCreatedAt: getTimeFromTimestamp(result.CreateTime), OriginalData: string(utils.MustMarshal(result)),
OriginalData: string(utils.MustMarshal(result)), ActualPayPrice: result.PayAmount,
ActualPayPrice: result.PayAmount, BaseFreightMoney: result.PostAmount,
BaseFreightMoney: result.PostAmount, InvoiceTitle: "",
InvoiceTitle: "", InvoiceTaxerID: "",
InvoiceTaxerID: "", InvoiceEmail: "",
InvoiceEmail: "", VendorOrgCode: vendorOrgCode,
VendorOrgCode: vendorOrgCode,
} }
if result.FinishTime != 0 { if result.FinishTime != 0 {
@@ -194,18 +193,27 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
globals.SugarLogger.Debugf("平台门店未绑定到京西系统 %s", err.Error()) globals.SugarLogger.Debugf("平台门店未绑定到京西系统 %s", err.Error())
return nil, nil, err return nil, nil, err
} }
// 订单不在门店营业时间来的订单,
openTime := localStore.OpenTime1 // 门店开始营业时间
closeTime := localStore.CloseTime1 // 门店结束营业时间
if localStore.CloseTime2 != 0 {
closeTime = localStore.CloseTime2
}
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 { //openTime := localStore.OpenTime1 // 门店开始营业时间
//closeTime := localStore.CloseTime1 // 门店结束营业时间
//if localStore.CloseTime2 != 0 {
// closeTime = localStore.CloseTime2
//}
//
//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.BusinessTypeImmediate
//} else {
// order.BusinessType = model.BusinessTypeDingshida
//}
if result.EarlyArrival { // 立即达
order.BusinessType = model.BusinessTypeImmediate order.BusinessType = model.BusinessTypeImmediate
} else { order.ExpectedDeliveredTime = getTimeFromTimestamp(result.TargetArrivalTime + 30*60) // 预计最晚送达时间
} else { // 定时达
order.BusinessType = model.BusinessTypeDingshida order.BusinessType = model.BusinessTypeDingshida
order.ExpectedDeliveredTime = getTimeFromTimestamp(result.EarliestReceiptTime + 30*60) // 预计最晚送达时间
} }
// 用户保密信息脱敏 // 用户保密信息脱敏