diff --git a/beike/Admin/Http/Controllers/CustomerController.php b/beike/Admin/Http/Controllers/CustomerController.php index a71cf212..5b044456 100644 --- a/beike/Admin/Http/Controllers/CustomerController.php +++ b/beike/Admin/Http/Controllers/CustomerController.php @@ -52,7 +52,7 @@ class CustomerController extends Controller 'customer_groups' => CustomerGroupRepo::list(), 'addresses' => AddressResource::collection($addresses), 'countries' => CountryRepo::all(), - 'country_id' => setting('country_id'), + 'country_id' => setting('system.country_id'), '_redirect' => $this->getRedirect(), ]; diff --git a/beike/Shop/Services/AccountService.php b/beike/Shop/Services/AccountService.php index d0d39698..e3893f82 100644 --- a/beike/Shop/Services/AccountService.php +++ b/beike/Shop/Services/AccountService.php @@ -26,8 +26,8 @@ class AccountService */ public static function register(array $data): Customer { - $data['customer_group_id'] = setting('default_customer_group_id', 1); // default_customer_group_id为默认客户组名称 - $data['status'] = !setting('approve_customer'); // approve_customer为是否需要审核客户 + $data['customer_group_id'] = setting('system.default_customer_group_id', 1); // default_customer_group_id为默认客户组名称 + $data['status'] = !setting('system.approve_customer'); // approve_customer为是否需要审核客户 $data['from'] = $data['from'] ?? 'pc'; $data['locale'] = locale(); diff --git a/beike/Shop/Services/CheckoutService.php b/beike/Shop/Services/CheckoutService.php index cd06736c..c70c6de4 100644 --- a/beike/Shop/Services/CheckoutService.php +++ b/beike/Shop/Services/CheckoutService.php @@ -120,7 +120,7 @@ class CheckoutService 'payment_address_id' => $this->cart->payment_address_id, 'payment_method_code' => $this->cart->payment_method_code, ], - 'country_id' => (int)setting('country_id'), + 'country_id' => (int)setting('system.country_id'), 'customer_id' => $customer->id ?? null, 'countries' => CountryRepo::all(), 'addresses' => $addresses,