diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go index 512ac803c..1a9c68fa8 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -40,7 +40,7 @@ var ( var ( VendorStatus2StatusMap = map[string]int{ utils.Int2Str(tiktokShop.CreateOrderStatusWaitPay): model.OrderStatusWait4Pay, // 1待支付 - utils.Int2Str(tiktokShop.CreateOrderStatusStockUp): model.OrderStatusDelivering, // 2备货中(部分发货) + utils.Int2Str(tiktokShop.CreateOrderStatusStockUp): model.OrderStatusAccepted, // 2备货中(部分发货) utils.Int2Str(tiktokShop.CreateOrderStatusDelivery): model.OrderStatusDelivering, // 3发货(发货完成) utils.Int2Str(tiktokShop.CreateOrderStatusCancel): model.OrderStatusCanceled, // 4取消 utils.Int2Str(tiktokShop.CreateOrderStatusOver): model.OrderStatusFinished, // 5完成 @@ -84,7 +84,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s order = &model.GoodsOrder{ VendorOrderID: result.OrderId, VendorID: model.VendorIDDD, - VendorStoreID: utils.Int64ToStr(result.ShopId), + VendorStoreID: "", StoreID: 0, StoreName: result.ShopName, ConsigneeName: result.MaskPostReceiver, @@ -118,11 +118,6 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s } order.DeliveryType = model.OrderDeliveryTypeStoreSelf order.Status = p.getStatusFromVendorStatus(result.OrderStatus) - if utils.IsTimeZero(order.ExpectedDeliveredTime) { - order.BusinessType = model.BusinessTypeImmediate - } else { - order.BusinessType = model.BusinessTypeDingshida - } if result.UserIdInfo != nil { order.VendorUserID = result.UserIdInfo.IdCardNo @@ -133,6 +128,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s order.ConsigneeLat = jxutils.StandardCoordinate2Int(originalLat) order.DiscountMoney = result.PromotionAmount + vendorStoreIdRelly := "" // 添加需要赠送的东西(暂时没有赠品套餐直接商品) multiSkuMap := make(map[int]int) if len(result.SkuOrderList) > 0 { @@ -174,8 +170,31 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s } multiSkuMap[sku.SkuID]++ order.Skus = append(order.Skus, sku) + vendorStoreIdRelly = extra.StoreInfo.StoreId } } + + localStore, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreIdRelly, model.VendorIDDD, vendorOrgCode) + if err != nil { + 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 { + order.BusinessType = model.BusinessTypeDingshida + } else { + order.BusinessType = model.BusinessTypeImmediate + + } + + order.JxStoreID = localStore.ID + order.StoreID = localStore.ID + order.VendorStoreID = vendorStoreIdRelly order.PmSubsidyMoney = result.PromotionAmount // 美团记录订单优惠总金额 for _, v := range order.Skus { if multiSkuMap[v.SkuID] > 1 && v.SalePrice == v.VendorPrice {