From 4480763be441c09e9034d6a347587a2b1a5e197a Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 17 十月 2023 21:01:47 +0800
Subject: [PATCH] fix
---
service/receipt.go | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/service/receipt.go b/service/receipt.go
index 9c49878..9ec0ba3 100644
--- a/service/receipt.go
+++ b/service/receipt.go
@@ -51,14 +51,20 @@
return err
}
}
- err = moneyAdder.AmountReceivableAdd(db, sourceId, decimal.Zero.Sub(receipt.Amount).Round(2))
- 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
+ }
}
- err = moneyAdder.AmountReceivedAdd(db, sourceId, receipt.Amount.Round(2))
- if err != nil {
- return err
- }
+
return nil
})
if err != nil {
@@ -124,8 +130,13 @@
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).
+ Find()
if err != nil {
return nil, 0, ecode.DBErr
}
@@ -179,7 +190,7 @@
}
}
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
}
--
Gitblit v1.8.0