From 41230a61df47c32ea3650f9ce074e8af55d9308e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Wed, 24 Mar 2021 16:41:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=88=A9=E5=8F=91?=
 =?UTF-8?q?=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/service/UserRebateService.php             | 3 ++-
 app/data/service/payment/BalancePyamentService.php | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/data/service/UserRebateService.php b/app/data/service/UserRebateService.php
index d3b606664..734f38a60 100644
--- a/app/data/service/UserRebateService.php
+++ b/app/data/service/UserRebateService.php
@@ -42,9 +42,10 @@ class UserRebateService extends Service
      */
     public function confirm(string $orderNo): array
     {
-        $map = ['order_no' => $orderNo, 'status' => 6];
+        $map = [['status', '>', 3], ['order_no', '=', $orderNo]];
         $order = $this->app->db->name('ShopOrder')->where($map)->find();
         if (empty($order)) return [0, '需处理的订单状态异常！'];
+
         $map = [['status', '=', 0], ['order_no', 'like', "{$orderNo}%"]];
         $this->app->db->name('DataUserRebate')->where($map)->update(['status' => 1]);
         if (UserUpgradeService::instance()->upgrade($order['uid'])) {
diff --git a/app/data/service/payment/BalancePyamentService.php b/app/data/service/payment/BalancePyamentService.php
index c943db252..41d8bbca0 100644
--- a/app/data/service/payment/BalancePyamentService.php
+++ b/app/data/service/payment/BalancePyamentService.php
@@ -63,10 +63,10 @@ class BalancePyamentService extends PaymentService
         data_save('DataUserBalance', [
             'uid'    => $order['uid'],
             'code'   => $order['order_no'],
-            'name'   => "订单余额支付",
+            'name'   => "账户余额支付",
             'remark' => "使用余额支付订单{$order['order_no']}金额{$paymentAmount}元",
             'amount' => -$paymentAmount,
-        ], 'code', ['name' => '订单余额支付']);
+        ], 'code', ['name' => '账户余额支付']);
         // 更新支付行为
         $this->updatePaymentAction($orderNo, CodeExtend::uniqidDate(20), $paymentAmount, '账户余额支付');
         // 刷新用户余额