Merge branch 'rsm' of e.coding.net:rosydev/jx-callback into rsm
This commit is contained in:
@@ -138,6 +138,7 @@ func PayByBalance(ctx *jxcontext.Context, orderID string, restPrice, payType int
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return "获取订单信息失败", err
|
return "获取订单信息失败", err
|
||||||
}
|
}
|
||||||
|
globals.SugarLogger.Debug("orderInfo.OrderType===============", orderInfo.OrderType)
|
||||||
//获取用户 会员账户信息
|
//获取用户 会员账户信息
|
||||||
globals.SugarLogger.Debug("开始获取会员信息")
|
globals.SugarLogger.Debug("开始获取会员信息")
|
||||||
userBill, err := dao.GetUserBill(db, orderInfo.UserID, "")
|
userBill, err := dao.GetUserBill(db, orderInfo.UserID, "")
|
||||||
@@ -185,6 +186,7 @@ func PayByBalance(ctx *jxcontext.Context, orderID string, restPrice, payType int
|
|||||||
}
|
}
|
||||||
//增加一条用户账单
|
//增加一条用户账单
|
||||||
globals.SugarLogger.Debug("开始创建用户账单")
|
globals.SugarLogger.Debug("开始创建用户账单")
|
||||||
|
globals.SugarLogger.Debug("微信需支付", orderInfo.PayPrice)
|
||||||
if err = financial.AddBillExpend(txDB, userBill.BillID, model.BillTypePayByAccountBalance, orderInfo.PayPrice, 0); err != nil {
|
if err = financial.AddBillExpend(txDB, userBill.BillID, model.BillTypePayByAccountBalance, orderInfo.PayPrice, 0); err != nil {
|
||||||
globals.SugarLogger.Debug("创建账单失败")
|
globals.SugarLogger.Debug("创建账单失败")
|
||||||
dao.Rollback(db, txDB)
|
dao.Rollback(db, txDB)
|
||||||
|
|||||||
Reference in New Issue
Block a user