|
|
@@ -2,6 +2,7 @@ package shanghu
|
|
|
|
|
|
import (
|
|
|
orm "duoduo/database"
|
|
|
+ "fmt"
|
|
|
"github.com/shopspring/decimal"
|
|
|
"time"
|
|
|
)
|
|
|
@@ -185,6 +186,8 @@ func (m *ClientPayTrans) SettleAdd(merchantAmount, clientAmount decimal.Decimal,
|
|
|
var err error
|
|
|
var clientAccount MerchantClientAccount
|
|
|
var merchantAccount MerchantAccount
|
|
|
+ var amountPreMerchant decimal.Decimal
|
|
|
+ var amountPreClient decimal.Decimal
|
|
|
tx := orm.ShMysql.Begin()
|
|
|
defer func() {
|
|
|
if err != nil {
|
|
|
@@ -210,6 +213,7 @@ func (m *ClientPayTrans) SettleAdd(merchantAmount, clientAmount decimal.Decimal,
|
|
|
return err
|
|
|
}
|
|
|
}
|
|
|
+ amountPreMerchant = merchantAccount.Amount
|
|
|
|
|
|
err = tx.Table("merchant_client_account").Select("*").Where("client_open_id = ?", clientOpenId).Find(&clientAccount).Error
|
|
|
if err != nil && err.Error() != "record not found" {
|
|
|
@@ -227,6 +231,8 @@ func (m *ClientPayTrans) SettleAdd(merchantAmount, clientAmount decimal.Decimal,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ amountPreClient = clientAccount.Amount
|
|
|
+
|
|
|
//做金额加减操作并且入日志库
|
|
|
merchantAmountAdd := merchantAccount.Amount.Add(merchantAmount)
|
|
|
err = tx.Table("merchant_account").Model(&merchantAccount).Where("merchant_open_id = ? and version = ?", merchantOpenId, merchantAccount.Version).Updates(
|
|
|
@@ -240,9 +246,12 @@ func (m *ClientPayTrans) SettleAdd(merchantAmount, clientAmount decimal.Decimal,
|
|
|
|
|
|
var merchantAccountLog MerchantAccountLog
|
|
|
|
|
|
+ fmt.Println("amountPreMerchant = ", amountPreMerchant)
|
|
|
+ fmt.Println("merchantAccount.Amount = ", merchantAccount.Amount)
|
|
|
+
|
|
|
merchantAccountLog.MerchantOpenID = merchantOpenId
|
|
|
merchantAccountLog.UpdatedAt = time.Now()
|
|
|
- merchantAccountLog.AmountPre = merchantAccount.Amount
|
|
|
+ merchantAccountLog.AmountPre = amountPreMerchant
|
|
|
merchantAccountLog.AmountAfter = merchantAmountAdd
|
|
|
merchantAccountLog.ReviewAmountAfter = merchantAccount.ReviewAmount
|
|
|
merchantAccountLog.ReviewAmountPre = merchantAccount.ReviewAmount
|
|
|
@@ -267,7 +276,7 @@ func (m *ClientPayTrans) SettleAdd(merchantAmount, clientAmount decimal.Decimal,
|
|
|
|
|
|
clientAccountLog.ClientOpenID = clientOpenId
|
|
|
clientAccountLog.UpdatedAt = time.Now()
|
|
|
- clientAccountLog.AmountPre = clientAccount.Amount
|
|
|
+ clientAccountLog.AmountPre = amountPreClient
|
|
|
clientAccountLog.AmountAfter = clientAmountAdd
|
|
|
clientAccountLog.ReviewAmountAfter = clientAccount.ReviewAmount
|
|
|
clientAccountLog.ReviewAmountPre = clientAccount.ReviewAmount
|
