diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go index c2fee67e7..6b75d886c 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -86,25 +86,24 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s } orderMap = result order = &model.GoodsOrder{ - VendorOrderID: result.OrderId, - VendorID: model.VendorIDDD, - VendorStoreID: "", - StoreID: 0, - CoordinateType: model.CoordinateTypeMars, - BuyerComment: result.BuyerWords, - 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, - StatusTime: getTimeFromTimestamp(result.CreateTime), - OrderCreatedAt: getTimeFromTimestamp(result.CreateTime), - OriginalData: string(utils.MustMarshal(result)), - ActualPayPrice: result.PayAmount, - BaseFreightMoney: result.PostAmount, - InvoiceTitle: "", - InvoiceTaxerID: "", - InvoiceEmail: "", - VendorOrgCode: vendorOrgCode, + VendorOrderID: result.OrderId, + VendorID: model.VendorIDDD, + VendorStoreID: "", + StoreID: 0, + CoordinateType: model.CoordinateTypeMars, + BuyerComment: result.BuyerWords, + PickDeadline: utils.DefaultTimeValue, + VendorStatus: utils.Int64ToStr(result.OrderStatus), //1待支付/103部分支付/105已支付/2备货中/101部分发货/3已发货/4取消/完成/21发货前退款完成/22发货后退款/39收货后退款 + OrderSeq: 0, + StatusTime: getTimeFromTimestamp(result.CreateTime), + OrderCreatedAt: getTimeFromTimestamp(result.CreateTime), + OriginalData: string(utils.MustMarshal(result)), + ActualPayPrice: result.PayAmount, + BaseFreightMoney: result.PostAmount, + InvoiceTitle: "", + InvoiceTaxerID: "", + InvoiceEmail: "", + VendorOrgCode: vendorOrgCode, } if result.FinishTime != 0 { @@ -194,18 +193,27 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s globals.SugarLogger.Debugf("平台门店未绑定到京西系统 %s", err.Error()) 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 - } else { + order.ExpectedDeliveredTime = getTimeFromTimestamp(result.TargetArrivalTime + 30*60) // 预计最晚送达时间 + } else { // 定时达 order.BusinessType = model.BusinessTypeDingshida + order.ExpectedDeliveredTime = getTimeFromTimestamp(result.EarliestReceiptTime + 30*60) // 预计最晚送达时间 } // 用户保密信息脱敏