|
|
@@ -95,6 +95,7 @@ func (m *MerchantAccount) ActiveCancelSettle(log []ActiveCancelLog, merchantAcco
|
|
|
|
|
|
//分账
|
|
|
//商家加款
|
|
|
+ merchantAmountPre := merchantAccount.Amount
|
|
|
merchantAmountAdd := merchantAccount.Amount.Add(payTrans.MerchantAmount)
|
|
|
result := tx.Table("merchant_account").Model(&merchantAccount).Where("merchant_open_id = ? and version = ?", merchantAccount.MerchantOpenID, merchantAccount.Version).Updates(
|
|
|
map[string]interface{}{
|
|
|
@@ -113,7 +114,7 @@ func (m *MerchantAccount) ActiveCancelSettle(log []ActiveCancelLog, merchantAcco
|
|
|
|
|
|
merchantAccountLog.MerchantOpenID = merchantAccount.MerchantOpenID
|
|
|
merchantAccountLog.UpdatedAt = time.Now()
|
|
|
- merchantAccountLog.AmountPre = merchantAccount.Amount
|
|
|
+ merchantAccountLog.AmountPre = merchantAmountPre
|
|
|
merchantAccountLog.AmountAfter = merchantAmountAdd
|
|
|
merchantAccountLog.ReviewAmountAfter = merchantAccount.ReviewAmount
|
|
|
merchantAccountLog.ReviewAmountPre = merchantAccount.ReviewAmount
|
|
|
@@ -132,6 +133,7 @@ func (m *MerchantAccount) ActiveCancelSettle(log []ActiveCancelLog, merchantAcco
|
|
|
|
|
|
// 客户加款
|
|
|
if payTrans.InvitationCode != YuanShiMa && payTrans.InvitationCode != "" {
|
|
|
+ clientAmountPre := activeClientAccount.Amount
|
|
|
clientAmountAdd := activeClientAccount.Amount.Add(payTrans.ClientAmount)
|
|
|
clientResult := tx.Table("active_client_account").Model(&activeClientAccount).Where("client_open_id = ? and version = ?", activeClientAccount.ClientOpenID, activeClientAccount.Version).Updates(
|
|
|
map[string]interface{}{
|
|
|
@@ -150,7 +152,7 @@ func (m *MerchantAccount) ActiveCancelSettle(log []ActiveCancelLog, merchantAcco
|
|
|
|
|
|
clientAccountLog.ClientOpenID = activeClientAccount.ClientOpenID
|
|
|
clientAccountLog.UpdatedAt = time.Now()
|
|
|
- clientAccountLog.AmountPre = activeClientAccount.Amount
|
|
|
+ clientAccountLog.AmountPre = clientAmountPre
|
|
|
clientAccountLog.AmountAfter = clientAmountAdd
|
|
|
clientAccountLog.ReviewAmountAfter = activeClientAccount.ReviewAmount
|
|
|
clientAccountLog.ReviewAmountPre = activeClientAccount.ReviewAmount
|
