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-10-12 20:03:11 +08:00
parent 86da558126
commit 903aec8a5a
1 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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