diff --git a/internal/v2/logic/app/jyy/jyy.go b/internal/v2/logic/app/jyy/jyy.go index d8c1636..55943da 100644 --- a/internal/v2/logic/app/jyy/jyy.go +++ b/internal/v2/logic/app/jyy/jyy.go @@ -740,9 +740,9 @@ func (o logic) CompanyAllAmount(id uint) (res Data) { for _, v := range record { res.Balance = res.Balance.Add(v.Income) if v.Type == order.Card { - res.TaxAmount = v.Income.Mul(cr).Round(2) + res.TaxAmount = res.TaxAmount.Add(v.Income.Mul(cr).Round(2)) } else { - res.TaxAmount = v.Income.Mul(rate).Round(2) + res.TaxAmount = res.TaxAmount.Add(v.Income.Mul(rate).Round(2)) } } res.ActualAmount = res.Balance.Sub(res.TaxAmount) diff --git a/internal/v2/model/gys/goods/gysGoodsSku.go b/internal/v2/model/gys/goods/gysGoodsSku.go index a66c32b..26df6e8 100644 --- a/internal/v2/model/gys/goods/gysGoodsSku.go +++ b/internal/v2/model/gys/goods/gysGoodsSku.go @@ -44,7 +44,7 @@ func (r GysGoodsSkuTempModel) TableName() string { //调整库存,通过code来匹配 func (r *GysGoodsSkuModel) SetInventoryByCode(code string, inventory uint) { - r.GetDb().Model(&GysGoodsSkuModel{}).Where("code=?", code).Update("inventory=?", inventory) + r.GetDb().Model(&GysGoodsSkuModel{}).Where("code=?", code).Update("inventory", inventory) } func (r *GysGoodsSkuModel) Create(data *GysGoodsSkuModel) {