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:
邹宗楠
2024-04-28 15:39:18 +08:00
parent 83538d8dce
commit 46fe089e36
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
business/jxcallback/orderman/order.go
View File

@@ -786,7 +786,7 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao.
//} //}
if v.ShopPrice == 0 { if v.ShopPrice == 0 {
v.ShopPrice = v.SalePrice * 70 / 100 v.ShopPrice = v.SalePrice * 60 / 100
} }
} else { } else {
// TODO 客户端当前逻辑认为SkuID为0为赠品 // TODO 客户端当前逻辑认为SkuID为0为赠品
@@ -804,12 +804,12 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao.
if len(storeSkus) > 0 { if len(storeSkus) > 0 {
v.ShopPrice = int64(storeSkus[0].Price) v.ShopPrice = int64(storeSkus[0].Price)
} else { } else {
v.ShopPrice = v.SalePrice * 70 / 100 v.ShopPrice = v.SalePrice * 60 / 100
} }
} else { } else {
v.ShopPrice = int64(skuBindInfo.Price) v.ShopPrice = int64(skuBindInfo.Price)
if v.ShopPrice == 0 { if v.ShopPrice == 0 {
v.ShopPrice = v.SalePrice * 70 / 100 v.ShopPrice = v.SalePrice * 60 / 100
} }
} }
v.SkuName = jxutils.ComposeSkuNameOriginal(skuBindInfo.Prefix, skuBindInfo.Name, skuBindInfo.Comment, skuBindInfo.Unit, skuBindInfo.SpecQuality, skuBindInfo.SpecUnit, 0) v.SkuName = jxutils.ComposeSkuNameOriginal(skuBindInfo.Prefix, skuBindInfo.Name, skuBindInfo.Comment, skuBindInfo.Unit, skuBindInfo.SpecQuality, skuBindInfo.SpecUnit, 0)
@@ -2350,7 +2350,7 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
shopPriceSum += storeSkuList[0].Price * sku.Count shopPriceSum += storeSkuList[0].Price * sku.Count
sku.ShopPrice = int64(storeSkuList[0].Price) sku.ShopPrice = int64(storeSkuList[0].Price)
} else { } else {
shopPriceSum += int(sku.SalePrice) * 70 / 100 shopPriceSum += int(sku.SalePrice) * 60 / 100
} }
} }
if order.EarningType == model.EarningTypeQuote && shopPriceSum+700 > int(order.TotalShopMoney) { if order.EarningType == model.EarningTypeQuote && shopPriceSum+700 > int(order.TotalShopMoney) {