From 530fed8ec225453572d57b15c200ab062c335457 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 01 十一月 2023 19:20:21 +0800
Subject: [PATCH] 公海member_id使用0
---
service/receipt.go | 121 +++++++++++++++++++++++++++++++++++++--
1 files changed, 113 insertions(+), 8 deletions(-)
diff --git a/service/receipt.go b/service/receipt.go
index 386beb5..b4999cf 100644
--- a/service/receipt.go
+++ b/service/receipt.go
@@ -17,18 +17,55 @@
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
+ }
+ }
+
+ // todo tmp
+ if sourceId != 0 {
+ 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 +79,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
@@ -61,8 +130,14 @@
return ecode.OK
}
-func (ReceiptService) GetReceiptList() ([]*model.Receipt, int64, int) {
- list, total, err := model.NewReceiptSearch().Find()
+func (ReceiptService) GetReceiptList(params request.GetReceiptList) ([]*model.Receipt, int64, int) {
+ list, total, err := model.NewReceiptSearch().
+ SetPage(params.Page, params.PageSize).
+ SetSourceType(params.SourceType).
+ SetSourceId(params.SourceId).
+ SetClientId(params.ClientId).
+ SetPrincipalIds(params.PrincipleIds).
+ Find()
if err != nil {
return nil, 0, ecode.DBErr
}
@@ -93,19 +168,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).Update(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