diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index a1b8b2039..a07ff9cde 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -859,20 +859,50 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao. intVendorSkuID := utils.Str2Int64WithDefault(v.VendorSkuID, 0) if intVendorSkuID != 0 && v.VendorSkuID != "-70000" { // todo hard code skuBindInfo := skumapper[v.VendorSkuID] + if v.SkuID == 0 { + v.SkuID = v.JxSkuID + } if skuBindInfo == nil { - // 商品直接在美团创建,本地不存在商品信息,且为美团商品.如果门店是报价门店则获取商品的进货价 - //if v.ShopPrice == model.NO && v.VendorID == model.VendorIDMTWM && order.OrderPayPercentage >= 50 { - // - //} + skuList, _ := dao.GetStoresSkusInfo(db, []int{jxStoreID}, []int{v.SkuID}) + if len(skuList) == model.YES { + //结算类型 + jxOrderEarningType := 0 + if storeDetail.PayPercentage < 50 { + jxOrderEarningType = model.EarningTypePoints + } else { + jxOrderEarningType = model.EarningTypeQuote + } + switch jxOrderEarningType { + case model.EarningTypeQuote: + v.ShopPrice = int64(skuList[0].Price) + case model.EarningTypePoints: + if order.VendorID == model.VendorIDJD { + v.ShopPrice = int64(skuList[0].JdPrice) + } else if order.VendorID == model.VendorIDMTWM { + v.ShopPrice = int64(skuList[0].MtwmPrice) + skuList[0].MtwmID = utils.Str2Int64(v.VendorSkuID) + dao.UpdateEntity(db, skuList[0], "MtwmID") + } else if order.VendorID == model.VendorIDEBAI { + v.ShopPrice = int64(skuList[0].EbaiPrice) + skuList[0].EbaiID = utils.Str2Int64(v.VendorSkuID) + dao.UpdateEntity(db, skuList[0], "EbaiID") + } else if order.VendorID == model.VendorIDDD { + v.ShopPrice = int64(skuList[0].DdPrice) + skuList[0].DdID = utils.Str2Int64(v.VendorSkuID) + dao.UpdateEntity(db, skuList[0], "DdID") + } else if order.VendorID == model.VendorIDTaoVegetable { + v.ShopPrice = int64(skuList[0].TaoPrice) + skuList[0].TaoID = utils.Str2Int64(v.VendorSkuID) + dao.UpdateEntity(db, skuList[0], "TaoID") + } + } + } if v.ShopPrice == 0 { v.ShopPrice = v.SalePrice * 60 / 100 } } else { // TODO 客户端当前逻辑认为SkuID为0为赠品 - if v.SkuID == 0 { - v.SkuID = v.JxSkuID - } v.JxSkuID = skuBindInfo.SkuID //京东商城的话,门店里可能取不到对应商品 if order.VendorID == model.VendorIDJDShop /*|| order.VendorID == model.VendorIDDD*/ {