diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php index aa0aca19..3b501227 100644 --- a/app/controller/api/store/merchant/MerchantIntention.php +++ b/app/controller/api/store/merchant/MerchantIntention.php @@ -155,32 +155,16 @@ class MerchantIntention extends BaseController } $intenInfo = Db::name('merchant_intention')->where('mer_intention_id', $merInfo['mer_intention_id'] ?? 0)->where('type', 1)->find(); if (empty($intenInfo)) { - return app('json')->fail('商户状态异常'); - } else { - /* - 'phone', - 'mer_name', - 'company_name', - 'address', - 'name', - 'code', - 'images', - 'merchant_category_id', - 'mer_type_id', - 'social_credit_code', - 'area_id', - 'street_id', - 'village_id', $intenInfo = [ - 'uid' => 0, - 'phone' => 0, - 'mer_name' => 0, - 'company_name' => 0, - 'name' => 0, - 'social_credit_code' => 0, - 'address' => 0, + 'uid' => $merInfo['uid'], + 'mer_id' => $merInfo['mer_id'], + 'phone' => $merInfo['mer_phone'], + 'mer_name' => $merInfo['mer_name'], + 'merchant_category_id' => $merInfo['category_id'], + 'mer_type_id' => $merInfo['type_id'], + 'is_old_mer' => 1 ]; - */ + } else { } $intenInfo['bank_username'] = $data['bank_username'];