From f65c9f835521a758ba9b029d61911274011fbdb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 4 Mar 2021 16:48:47 +0800
Subject: [PATCH] aa

---
 business/partner/partner_store_acct.go        |  4 ++--
 business/partner/purchase/jx/localjx/order.go | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/business/partner/partner_store_acct.go b/business/partner/partner_store_acct.go
index 02a574a70..74f0f9b57 100644
--- a/business/partner/partner_store_acct.go
+++ b/business/partner/partner_store_acct.go
@@ -19,12 +19,12 @@ func InitStoreAcctManager(curStoreManager IStoreAcctManager) {
 
 type IStoreAcctManager interface {
 	//增加一条收入流水
-	InsertStoreAcctIncome(ctx *jxcontext.Context, db *dao.DaoDB, storeID, price, acctType int) (err error)
+	InsertStoreAcctIncome(ctx *jxcontext.Context, db *dao.DaoDB, storeID, price, acctType int, vendorOrderID string) (err error)
 	//增加一条支出流水
 	InsertStoreAcctExpend(ctx *jxcontext.Context, db *dao.DaoDB, storeID, price, acctType int, vendorOrderID string) (err error)
 	//更新门店账户
 	UpdateStoreAcctBalance(ctx *jxcontext.Context, storeID, price int, isIncome bool) (err error)
 	InsertStoreAcctExpendAndUpdateStoreAcctBalance(ctx *jxcontext.Context, storeID, price, acctType int, vendorOrderID string) (err error)
-	InsertStoreAcctIncomeAndUpdateStoreAcctBalance(ctx *jxcontext.Context, storeID, price, acctType int) (err error)
+	InsertStoreAcctIncomeAndUpdateStoreAcctBalance(ctx *jxcontext.Context, storeID, price, acctType int, vendorOrderID string) (err error)
 	CheckStoreAcctExpendExist(storeID int, vendorOrderID string) (result bool, err error)
 }
diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index 91db375e8..3062edcb0 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -558,6 +558,17 @@ func OnPayFinished(orderPay *model.OrderPay) (err error) {
 				dao.UpdateEntity(dao.GetDB(), userMembers[0], "IsPay")
 				err = nil
 			}
+		case model.PayTypeTL_StoreAcctPay: //门店账户充值完成后直接入账
+			storeOrder := &model.StoreAcctOrder{
+				VendorOrderID: orderPay.VendorOrderID,
+			}
+			if err = dao.GetEntity(dao.GetDB(), storeOrder, "VendorOrderID"); err == nil && storeOrder.ID != 0 {
+				storeOrder.OrderFinishedAt = time.Now()
+				storeOrder.Status = model.OrderStatusFinished
+				if _, err = dao.UpdateEntity(dao.GetDB(), storeOrder, "OrderFinishedAt", "Status"); err == nil {
+					partner.CurStoreAcctManager.InsertStoreAcctIncomeAndUpdateStoreAcctBalance(nil, storeOrder.StoreID, storeOrder.ActualPayPrice, partner.StoreAcctTypeIncomePay, orderPay.VendorOrderID)
+				}
+			}
 		default:
 			priceDefendOrders, _ := dao.GetPriceDefendOrder(dao.GetDB(), orderPay.VendorOrderID, nil, nil, []int{jxutils.GetDefendPriceIssue()}, 0, -1, -1, 0, "", utils.ZeroTimeValue, utils.ZeroTimeValue, false)
 			if len(priceDefendOrders) > 0 {