From 278574a8974717b806e849f002489b76485ff443 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 28 Oct 2020 14:39:18 +0800
Subject: [PATCH] mofidt

---
 business/jxstore/financial/pay.go | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/business/jxstore/financial/pay.go b/business/jxstore/financial/pay.go
index 69da0f50c..414ca707a 100644
--- a/business/jxstore/financial/pay.go
+++ b/business/jxstore/financial/pay.go
@@ -25,8 +25,7 @@ type PayHandlerInterface interface {
 
 func OnPayFinished(order *model.Order) (err error) {
 	var (
-		db     = dao.GetDB()
-		billID int64
+		db = dao.GetDB()
 	)
 	globals.SugarLogger.Debugf("OnPayFinished begin modify account order: %v", utils.Format4Output(order, false))
 	dao.Begin(db)
@@ -46,13 +45,8 @@ func OnPayFinished(order *model.Order) (err error) {
 	switch order.Type {
 	case model.OrderTypeAccount:
 		//如果是账户充值（发布任务等）
-		//1、账户收入表明细
-		if err = AddBillIncome(db, billID, model.BillTypeInvest, order.PayPrice); err != nil {
-			dao.Rollback(db)
-		}
-		//2、账户表账户余额增加相应值
-		userBill.AccountBalance += order.PayPrice
-		if _, err = dao.UpdateEntity(db, userBill, "AccountBalance"); err != nil {
+		//账户收入
+		if err = AddIncomeUpdateAccount(db, userBill, model.BillTypeInvest, order.PayPrice); err != nil {
 			dao.Rollback(db)
 		}
 	default:
@@ -66,8 +60,7 @@ func OnPayFinished(order *model.Order) (err error) {
 
 func OnCashFinished(order *model.Order) (err error) {
 	var (
-		db     = dao.GetDB()
-		billID int64
+		db = dao.GetDB()
 	)
 	globals.SugarLogger.Debugf("OnCashFinished begin modify account order: %v", utils.Format4Output(order, false))
 	dao.Begin(db)
@@ -87,13 +80,8 @@ func OnCashFinished(order *model.Order) (err error) {
 	switch order.Type {
 	case model.OrderTypeAccount:
 		//如果是账户提现
-		//1、账户支出明细增加一条
-		if err = AddBillExpend(db, billID, model.BillTypeCash, order.PayPrice); err != nil {
-			dao.Rollback(db)
-		}
-		//2、账户表账户余额减少相应值
-		userBill.AccountBalance -= order.PayPrice
-		if _, err = dao.UpdateEntity(db, userBill, "AccountBalance"); err != nil {
+		//账户支出
+		if err = AddExpendUpdateAccount(db, userBill, model.BillTypeCash, order.PayPrice); err != nil {
 			dao.Rollback(db)
 		}
 	default: