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'];