From 9a7e0a7da01a9f9625ceaca0c61a59c540c6438f Mon Sep 17 00:00:00 2001 From: wangpengfei <274878379@qq.com> Date: 星期五, 18 八月 2023 17:32:10 +0800 Subject: [PATCH] fix --- service/receipt.go | 105 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 99 insertions(+), 6 deletions(-) diff --git a/service/receipt.go b/service/receipt.go index 386beb5..9c49878 100644 --- a/service/receipt.go +++ b/service/receipt.go @@ -17,18 +17,49 @@ func (ReceiptService) AddReceipt(receipt *model.Receipt) int { var moneyAdder model.MoneyAdder + var sourceId int + var collection *model.ServiceCollectionPlan + var err error switch receipt.SourceType { case constvar.ReceiptSourceTypeSalesDetails: moneyAdder = model.NewSalesDetailsSearch() + sourceId = receipt.SourceId case constvar.ReceiptSourceTypeServiceContract: moneyAdder = model.NewServiceContractSearch() + sourceId = receipt.SourceId + case constvar.ReceiptSourceTypeCollectionPlan: + collection, err = model.NewServiceCollectionPlanSearch().SetId(receipt.SourceId).First() + if err != nil { + return ecode.DBErr + } + sourceId = collection.SourceId + switch collection.SourceType { + case constvar.CollectionSourceTypeSaleDetails: + moneyAdder = model.NewSalesDetailsSearch() + case constvar.CollectionSourceTypeServiceContract: + moneyAdder = model.NewServiceContractSearch() + } } - err := model.WithTransaction(func(db *gorm.DB) error { + err = model.WithTransaction(func(db *gorm.DB) error { err := model.NewReceiptSearch().SetOrm(db).Create(receipt) if err != nil { return err } - return moneyAdder.AmountReceivableAdd(db, receipt.SourceId, decimal.Zero.Sub(receipt.Amount).Round(2)) + if receipt.SourceType == constvar.ReceiptSourceTypeCollectionPlan { + err = model.NewServiceCollectionPlanSearch().SetOrm(db).UpdateStatusAndAmount(collection, receipt.Amount) + if err != nil { + return err + } + } + err = moneyAdder.AmountReceivableAdd(db, sourceId, decimal.Zero.Sub(receipt.Amount).Round(2)) + if err != nil { + return err + } + err = moneyAdder.AmountReceivedAdd(db, sourceId, receipt.Amount.Round(2)) + if err != nil { + return err + } + return nil }) if err != nil { return ecode.DBErr @@ -42,18 +73,50 @@ return ecode.DBErr } var moneyAdder model.MoneyAdder + var sourceId int + var collection *model.ServiceCollectionPlan switch receipt.SourceType { case constvar.ReceiptSourceTypeSalesDetails: moneyAdder = model.NewSalesDetailsSearch() + sourceId = receipt.SourceId case constvar.ReceiptSourceTypeServiceContract: moneyAdder = model.NewServiceContractSearch() + sourceId = receipt.SourceId + case constvar.ReceiptSourceTypeCollectionPlan: + collection, err = model.NewServiceCollectionPlanSearch().SetId(receipt.SourceId).First() + if err != nil { + return ecode.DBErr + } + sourceId = collection.SourceId + switch collection.SourceType { + case constvar.CollectionSourceTypeSaleDetails: + moneyAdder = model.NewSalesDetailsSearch() + case constvar.CollectionSourceTypeServiceContract: + moneyAdder = model.NewServiceContractSearch() + } } err = model.WithTransaction(func(db *gorm.DB) error { - err := model.NewReceiptSearch().SetId(id).Delete() + err := model.NewReceiptSearch().SetOrm(db).SetId(id).Delete() if err != nil { return err } - return moneyAdder.AmountReceivableAdd(db, receipt.SourceId, receipt.Amount.Round(2)) + + if receipt.SourceType == constvar.ReceiptSourceTypeCollectionPlan { + err = model.NewServiceCollectionPlanSearch().SetOrm(db).UpdateStatusAndAmount(collection, decimal.Zero.Sub(receipt.Amount)) + if err != nil { + return err + } + } + + err = moneyAdder.AmountReceivableAdd(db, sourceId, receipt.Amount.Round(2)) + if err != nil { + return err + } + err = moneyAdder.AmountReceivedAdd(db, sourceId, decimal.Zero.Sub(receipt.Amount).Round(2)) + if err != nil { + return err + } + return nil }) if err != nil { return ecode.DBErr @@ -93,19 +156,49 @@ return ecode.DBErr } var moneyAdder model.MoneyAdder + var sourceId int + var collection *model.ServiceCollectionPlan switch receipt.SourceType { case constvar.ReceiptSourceTypeSalesDetails: moneyAdder = model.NewSalesDetailsSearch() + sourceId = receipt.SourceId case constvar.ReceiptSourceTypeServiceContract: moneyAdder = model.NewServiceContractSearch() + sourceId = receipt.SourceId + case constvar.ReceiptSourceTypeCollectionPlan: + collection, err = model.NewServiceCollectionPlanSearch().SetId(receipt.SourceId).First() + if err != nil { + return ecode.DBErr + } + sourceId = collection.SourceId + switch collection.SourceType { + case constvar.CollectionSourceTypeSaleDetails: + moneyAdder = model.NewSalesDetailsSearch() + case constvar.CollectionSourceTypeServiceContract: + moneyAdder = model.NewServiceContractSearch() + } } err = model.WithTransaction(func(db *gorm.DB) error { - err := model.NewReceiptSearch().SetId(receipt.Id).Save(receipt) + err = model.NewReceiptSearch().SetId(receipt.Id).Save(receipt) if err != nil { return err } diffAmount := receipt.Amount.Sub(old.Amount) - return moneyAdder.AmountReceivableAdd(db, receipt.SourceId, diffAmount.Round(2)) + if receipt.SourceType == constvar.ReceiptSourceTypeCollectionPlan { + err = model.NewServiceCollectionPlanSearch().SetOrm(db).UpdateStatusAndAmount(collection, diffAmount) + if err != nil { + return err + } + } + err = moneyAdder.AmountReceivedAdd(db, sourceId, diffAmount.Round(2)) + if err != nil { + return err + } + err = moneyAdder.AmountReceivableAdd(db, sourceId, decimal.Zero.Sub(diffAmount).Round(2)) + if err != nil { + return err + } + return nil }) if err != nil { return ecode.DBErr -- Gitblit v1.8.0