From 9c173413b0aa50a45ac6800566f017bd0e195b56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Fri, 2 Feb 2024 18:50:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=91=E6=9F=9A=E9=9D=99=E6=80=81=20?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E4=BF=AE=E6=94=B98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/jinyou/model/Account.php   | 2 +-
 app/jinyou/model/UserPrice.php | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/jinyou/model/Account.php b/app/jinyou/model/Account.php
index 850e1db..859592d 100644
--- a/app/jinyou/model/Account.php
+++ b/app/jinyou/model/Account.php
@@ -55,7 +55,7 @@ class Account extends Model
                     'CreateTime' => date('Y-m-d H:i:s',time()),
                     'UpdateTime' => date('Y-m-d H:i:s',time()),
                     'DeleteTag' => 0,
-                    'Remark' => $account->region.$account->address,
+                    'Remark' => $account->region . $account->address,
                     'Raw' => $account->inlet_website,
                     'game_id' => $account->game_id,
                 ];
diff --git a/app/jinyou/model/UserPrice.php b/app/jinyou/model/UserPrice.php
index 6054ba1..8f81dc4 100644
--- a/app/jinyou/model/UserPrice.php
+++ b/app/jinyou/model/UserPrice.php
@@ -15,7 +15,10 @@ class UserPrice extends Model
         //根据用户价格
         if ($discount != 0) {
             if ($discount == -1) {
-                $price = $this->getOne(['UserId' => $user_id,'PackageId' => $package_info['Id']])['UserPrice'];
+                $user_price = $this->getOne(['UserId' => $user_id,'PackageId' => $package_info['Id']]);
+                if (isset($user_price['UserPrice'])) {
+                    $price = $user_price['UserPrice'];
+                }
             } else {
                 $scheme_model = new PriceScheme;
                 $discount = $scheme_model->getone(['Id' => $discount])['discount'];