Merge branch 'develop' of k.zhang/duoduo into master

models/shanghu/client.account.log.go

@@ -19,6 +19,7 @@ type MerchantClientAccountLog struct {
 	UpdatedAt         time.Time       `gorm:"column:updated_at;type:datetime(3)" json:"updated_at"`                     // 最后更新时间
 	DeletedAt         time.Time       `gorm:"column:deleted_at;type:datetime(3);default:null" json:"deleted_at"`        // 删除时间
 	Amount            decimal.Decimal `gorm:"column:amount;type:decimal(10,2)" json:"amount"`                           // 交易金额
+	PayTransId        int64           `gorm:"column:pay_trans_id;type:bigint(20)" json:"pay_trans_id"`                  // 交易id
 }
 
 func (m *MerchantClientAccountLog) TableName() string {

models/shanghu/merchant.account.log.go

@@ -19,7 +19,7 @@ type MerchantAccountLog struct {
 	UpdatedAt         time.Time       `gorm:"column:updated_at;type:datetime(3)" json:"updated_at"`                     // 最后更新时间
 	DeletedAt         time.Time       `gorm:"column:deleted_at;type:datetime(3);default:null" json:"deleted_at"`        // 删除时间
 	Amount            decimal.Decimal `gorm:"column:amount;type:decimal(10,2)" json:"amount"`                           // 交易金额
-
+	PayTransId        int64           `gorm:"column:pay_trans_id;type:bigint(20)" json:"pay_trans_id"`                  // 交易id
 }
 
 func (m *MerchantAccountLog) TableName() string {

models/shanghu/pay.go

@@ -181,7 +181,7 @@ func (m *ClientPayTrans) GetPayTransSuccessByMerchantID(pageSize int, pageIndex
 
 }
 
-func (m *ClientPayTrans) SettleAdd(merchantAmount, clientAmount decimal.Decimal, merchantOpenId, clientOpenId string) error {
+func (m *ClientPayTrans) SettleAdd(merchantAmount, clientAmount decimal.Decimal, merchantOpenId, clientOpenId string, payTransId int64) error {
 	// 使用事务 添加
 	var err error
 	var clientAccount MerchantClientAccount
@@ -256,7 +256,7 @@ func (m *ClientPayTrans) SettleAdd(merchantAmount, clientAmount decimal.Decimal,
 	merchantAccountLog.ReviewAmountAfter = merchantAccount.ReviewAmount
 	merchantAccountLog.ReviewAmountPre = merchantAccount.ReviewAmount
 	merchantAccountLog.Amount = merchantAmount
-
+	merchantAccountLog.PayTransId = payTransId
 	err = tx.Table("merchant_account_log").Create(&merchantAccountLog).Error
 	if err != nil {
 		return err
@@ -281,6 +281,7 @@ func (m *ClientPayTrans) SettleAdd(merchantAmount, clientAmount decimal.Decimal,
 	clientAccountLog.ReviewAmountAfter = clientAccount.ReviewAmount
 	clientAccountLog.ReviewAmountPre = clientAccount.ReviewAmount
 	clientAccountLog.Amount = clientAmount
+	clientAccountLog.PayTransId = payTransId
 
 	err = tx.Table("merchant_client_account_log").Create(&clientAccountLog).Error
 	if err != nil {

report/shang.hu.ka.go

@@ -60,7 +60,7 @@ func ClientAccount() {
 		merchantAmount := clientTrans.Amount.Sub(clientAmount).Round(2)
 		fmt.Println(merchantAmount)
 		//乐观锁
-		err = account.SettleAdd(merchantAmount, clientAmount, merchantCard.MerchantOpenID, clientTrans.ClientOpenID)
+		err = account.SettleAdd(merchantAmount, clientAmount, merchantCard.MerchantOpenID, clientTrans.ClientOpenID, clientTrans.ID)
 		if err != nil {
 			dataErr := make(map[string]interface{})
 			dataErr["account_status"] = 2            //分账失败