From c8d20b33d6126b60d56a0b107d455fe64ee45db3 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 18 Jun 2024 09:37:01 +0800
Subject: [PATCH] =?UTF-8?q?feat(user):=20=E4=BF=AE=E6=94=B9=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=BC=96=E8=BE=91=E9=80=BB=E8=BE=91=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=94=AF=E4=BB=98=E9=80=9A=E7=9F=A5=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/user/UserController.php | 3 ++-
 app/common/logic/PayNotifyLogic.php          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/admin/controller/user/UserController.php b/app/admin/controller/user/UserController.php
index 2b55bb1f6..b2046e788 100644
--- a/app/admin/controller/user/UserController.php
+++ b/app/admin/controller/user/UserController.php
@@ -57,7 +57,8 @@ class UserController extends BaseAdminController
      */
     public function edit()
     {
-        $params = (new UserValidate())->post()->goCheck('edit');
+        // $params = (new UserValidate())->post()->goCheck('edit');
+        $params = $this->request->post();
 	    $result = UserLogic::edit($params);
 	    if (true === $result) {
 		    return $this->success('编辑成功', [], 1, 1);
diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
index 24c1a74e1..b5ca18a3e 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -306,7 +306,7 @@ class PayNotifyLogic extends BaseLogic
         $financeLogic->order = $order;
         $financeLogic->user = ['uid' => $order['uid']];
         // if ($order->pay_type != 9 || $order->pay_type != 10) {
-        $financeLogic->in($transaction_id, $order['pay_price'], OrderEnum::USER_ORDER_PAY);  //用户订单支付
+        $financeLogic->in($transaction_id, $order['pay_price'], OrderEnum::USER_ORDER_PAY,$order['store_id'], $order['staff_id'], 0, $order['pay_type']);  //用户订单支付
         $count_frees = 0;
         //商户应该获得的钱 每个商品的price-ot_price 利润
         // if (isset($order->profit) && $order->profit > 0) {