Merge branch 'rsm' of e.coding.net:rosydev/jx-callback into rsm
This commit is contained in:
@@ -559,7 +559,7 @@ func InvestMember(ctx *jxcontext.Context, memberID int, userID string, isFree bo
|
|||||||
if err = auth2.CheckWeixinminiAuthBind(userIDReal); err != nil {
|
if err = auth2.CheckWeixinminiAuthBind(userIDReal); err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
if userBill.AccountBalance < memberCard.Price {
|
if userBill.AccountBalance < memberCard.ActPrice {
|
||||||
return model.ErrCodeAccountBalanceNotEnough, fmt.Errorf("用户余额不足,请充值!")
|
return model.ErrCodeAccountBalanceNotEnough, fmt.Errorf("用户余额不足,请充值!")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -600,8 +600,9 @@ func InvestMember(ctx *jxcontext.Context, memberID int, userID string, isFree bo
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if !isFree {
|
if !isFree {
|
||||||
|
|
||||||
//支出明细
|
//支出明细
|
||||||
if err = financial.AddExpendUpdateAccount(txDB, userBill, model.BillTypeMember, memberCard.Price, 0); err != nil {
|
if err = financial.AddExpendUpdateAccount(txDB, userBill, model.BillTypeMember, memberCard.ActPrice, 0); err != nil {
|
||||||
dao.Rollback(db, txDB)
|
dao.Rollback(db, txDB)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user