From a91f274d753217814c29c0e54a80b3931da5f593 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期四, 24 八月 2023 15:12:25 +0800 Subject: [PATCH] 退款单校验,增加累计金额校验 --- service/salesRefund.go | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/service/salesRefund.go b/service/salesRefund.go index cf548d9..d3fe5f8 100644 --- a/service/salesRefund.go +++ b/service/salesRefund.go @@ -4,6 +4,7 @@ "aps_crm/constvar" "aps_crm/model" "aps_crm/pkg/ecode" + "errors" "github.com/shopspring/decimal" "gorm.io/gorm" ) @@ -23,23 +24,29 @@ for _, product := range salesRefund.Products { amount = amount.Add(product.Amount.Mul(product.Price)) } - + code := ecode.OK err = model.WithTransaction(func(db *gorm.DB) error { err = model.NewSalesRefundSearch().Create(salesRefund) if err != nil { + code = ecode.DBErr return err } salesReturnRecord.AmountHasRefund = salesReturnRecord.AmountHasRefund.Add(amount).Round(2) + if salesReturnRecord.AmountHasRefund.GreaterThan(salesReturnRecord.AmountTotal) { + code = ecode.SalesRefundProductBeyondTotalAmount + return errors.New("閫�璐т骇鍝佸搴旀�讳环瓒呭嚭搴旈��鎬讳环") + } salesReturnRecord.AmountShouldRefund = salesReturnRecord.AmountTotal.Sub(salesReturnRecord.AmountHasRefund).Round(2) err = model.NewSalesReturnSearch().SetId(salesRefund.SourceId).Update(salesReturnRecord) if err != nil { + code = ecode.DBErr return err } return nil }) if err != nil { - return ecode.SalesRefundExist + return code } return ecode.OK @@ -54,7 +61,7 @@ if returnProductsMap[product.Id] == nil { return ecode.SalesRefundProductNotExist } - if returnProductsMap[product.Id].Price != product.Price || product.Amount.GreaterThan(returnProductsMap[product.Id].Amount) { + if !returnProductsMap[product.Id].Price.Equal(product.Price) || product.Amount.GreaterThan(returnProductsMap[product.Id].Amount) { return ecode.SalesRefundProductPriceOrAmountErr } } @@ -131,22 +138,31 @@ diffAmount = diffAmount.Sub(product.Amount.Mul(product.Price)) } + code := ecode.OK err = model.WithTransaction(func(db *gorm.DB) error { err = model.NewSalesRefundSearch().SetId(salesRefund.Id).Update(salesRefund) if err != nil { + code = ecode.DBErr return err } salesReturnRecord.AmountHasRefund = salesReturnRecord.AmountHasRefund.Sub(diffAmount).Round(2) salesReturnRecord.AmountShouldRefund = salesReturnRecord.AmountTotal.Sub(salesReturnRecord.AmountHasRefund).Round(2) + + if salesReturnRecord.AmountHasRefund.GreaterThan(salesReturnRecord.AmountTotal) { + code = ecode.SalesRefundProductBeyondTotalAmount + return errors.New("閫�璐т骇鍝佸搴旀�讳环瓒呭嚭搴旈��鎬讳环") + } + err = model.NewSalesReturnSearch().SetId(salesRefund.SourceId).Update(salesReturnRecord) if err != nil { + code = ecode.DBErr return err } return nil }) if err != nil { - return ecode.SalesRefundSetErr + return code } return ecode.OK -- Gitblit v1.8.0