diff --git a/internal/api/mobile/goods/detail.go b/internal/api/mobile/goods/detail.go index 6dbc935..fcf1da8 100644 --- a/internal/api/mobile/goods/detail.go +++ b/internal/api/mobile/goods/detail.go @@ -82,8 +82,8 @@ func (o allPrice) GetSalePrice(level int) decimal.Decimal { if level == 10 { return o.SalePurchasePrice.Mul(decimal.NewFromFloat(1.03)).Round(2) } - s1 := o.SalePurchasePrice.Mul(decimal.NewFromFloat(1.03)).Round(2) - s1 = s1.Add(o.DiscountPrice.Sub(o.SalePurchasePrice.Mul(decimal.NewFromFloat(1.03))).Mul(decimal.NewFromFloat(0.2)).Round(2)) + s1 := o.SalePurchasePrice.Mul(decimal.NewFromFloat(1.03)).Mul(decimal.NewFromFloat(1.2)).Round(2) + // s1 = s1.Add(o.DiscountPrice.Sub(o.SalePurchasePrice.Mul(decimal.NewFromFloat(1.03))).Mul(decimal.NewFromFloat(0.2)).Round(2)) return s1.Round(2) } diff --git a/internal/model/goods/sku.go b/internal/model/goods/sku.go index 6ec964f..a9db1d2 100755 --- a/internal/model/goods/sku.go +++ b/internal/model/goods/sku.go @@ -53,7 +53,7 @@ func (o *Sku) GetSalePrice(level int) decimal.Decimal { if level == 10 { return o.SalePurchasePrice.Mul(decimal.NewFromFloat(1.03)).Round(2) } - s1 := o.SalePurchasePrice.Mul(decimal.NewFromFloat(1.03)).Round(2) - s1 = s1.Add(o.DiscountPrice.Sub(o.SalePurchasePrice.Mul(decimal.NewFromFloat(1.03))).Mul(decimal.NewFromFloat(0.2)).Round(2)) + s1 := o.SalePurchasePrice.Mul(decimal.NewFromFloat(1.03)).Mul(decimal.NewFromFloat(1.2)).Round(2) + // s1 = s1.Add(o.DiscountPrice.Sub(o.SalePurchasePrice.Mul(decimal.NewFromFloat(1.03))).Mul(decimal.NewFromFloat(0.2)).Round(2)) return s1.Round(2) } diff --git a/internal/service/app/shop/benefit.go b/internal/service/app/shop/benefit.go index 95ddf23..9922fb8 100644 --- a/internal/service/app/shop/benefit.go +++ b/internal/service/app/shop/benefit.go @@ -113,7 +113,7 @@ func OrderProfit(od order.Information, tx *gorm.DB) error { // 实体店产生批发收益给子公司 extraBase := decimal.Zero for _, v := range ods { - extra := v.UnitPrice.Sub(v.PurchasePrice).Mul(decimal.NewFromFloat(0.2)).Round(2) + extra := v.PurchasePrice.Mul(decimal.NewFromFloat(1.03)).Round(2).Mul(decimal.NewFromFloat(0.2)).Round(2) extraBase = extraBase.Add(extra.Mul(decimal.NewFromFloat(define.Coefficient)).Round(2).Mul(decimal.NewFromInt(int64(v.Quantity)))) } if err := tx.Create(order.CreateProfit(u1.RootID, order.Sale, base, od.ID)).Error; err != nil { diff --git a/internal/v2/model/recook/goods/recookGoodsSku.go b/internal/v2/model/recook/goods/recookGoodsSku.go index e28aab9..d7fa890 100644 --- a/internal/v2/model/recook/goods/recookGoodsSku.go +++ b/internal/v2/model/recook/goods/recookGoodsSku.go @@ -61,8 +61,8 @@ func (r *RecookGoodsSkuModel) GetSalePrice(level int) decimal.Decimal { if level == 10 { return r.SalePurchasePrice.Mul(decimal.NewFromFloat(1.03)).Round(2) } - s1 := r.SalePurchasePrice.Mul(decimal.NewFromFloat(1.03)).Round(2) - s1 = s1.Add(r.DiscountPrice.Sub(r.SalePurchasePrice.Mul(decimal.NewFromFloat(1.03))).Mul(decimal.NewFromFloat(0.2)).Round(2)) + s1 := r.SalePurchasePrice.Mul(decimal.NewFromFloat(1.03)).Mul(decimal.NewFromFloat(1.2)).Round(2) + // s1 = s1.Add(r.DiscountPrice.Sub(r.SalePurchasePrice.Mul(decimal.NewFromFloat(1.03))).Mul(decimal.NewFromFloat(0.2)).Round(2)) return s1.Round(2) }