diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php index 01560b84..6d70db10 100644 --- a/app/controller/api/Auth.php +++ b/app/controller/api/Auth.php @@ -369,10 +369,11 @@ class Auth extends BaseController if ($store_service) { $mer_arr = Db::name('merchant')->where('mer_id', $store_service['mer_id'])->where('is_del', 0)->field('type_id,mer_avatar,mer_banner,business_status,mer_info,category_id,service_phone,mer_address,uid,mer_name,create_time,update_time,mer_settlement_agree_status,is_margin,street_id')->find(); + $bank_info = Db::name('merchant_intention')->where('mer_id', $store_service['mer_id'])->field('company_name,bank_username,bank_opening,bank_code')->find(); if ($mer_arr && $mer_arr['mer_avatar'] != '' && $mer_arr['mer_banner'] != '' && $mer_arr['mer_info'] && $mer_arr['service_phone'] != '' && $mer_arr['mer_address'] != '') { $data['is_wsxx'] = 1; } - $data['mer_info'] = $mer_arr; + $data['mer_info'] = array_merge($mer_arr,$bank_info); $typCode = Db::name('merchant_type')->where('mer_type_id', $mer_arr['type_id'] ?? 0)->value('type_code'); $data['mer_info']['type_code'] = $typCode; $data['mer_info']['setting_status'] = 0;