diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php index abae7318..584a4a8f 100755 --- a/app/controller/api/store/merchant/MerchantIntention.php +++ b/app/controller/api/store/merchant/MerchantIntention.php @@ -80,32 +80,6 @@ class MerchantIntention extends BaseController 'id' => $intention->mer_intention_id ] ]); - $areaInfo = Db::name('geo_area')->where('area_code', $data['area_id'] ?? '')->find(); - $sendData = [ - 'type' => 1, - 'type_name' => Db::name('merchant_type')->where('mer_type_id', $data['mer_type_id'])->value('type_name', ''), - 'category_name' => Db::name('merchant_category')->where('merchant_category_id', $data['merchant_category_id'])->value('category_name', ''), - 'mer_name' => $data['mer_name'] ?? '', - 'company_name' => $data['company_name'] ?? '', - 'organization_code' => $data['social_credit_code'] ?? '', - 'master_name' => $data['name'], - 'master_phone' => $data['phone'], - 'images' => !empty($data['images']) ? json_encode($data['images']) : '', - 'city' => $areaInfo['city_code'] ?? '', - 'area' => $data['area_id'] ?? '', - 'street' => $data['street_id'] ?? '', - 'village' => $data['village_id'] ?? '', - 'address' => $data['address'] ?? '', - 'mer_intention_id' => $intention->mer_intention_id, - 'type_id'=>$data['mer_type_id']??'', - 'is_company'=>$data['is_company']??'', - ]; - $postUrl = env('TASK_WORKER_HOST_URL') . '/adminapi/company/createShopMerchant'; - $res = $this->sendMerIntentionApply($sendData, $postUrl); - if (!$res['ok']) { - Db::name('merchant_intention')->where('mer_intention_id', $intention->mer_intention_id)->delete(); - throw new ValidateException('供销平台申请商户入驻失败,' . $res['msg']); - } return app('json')->success('提交成功'); } @@ -353,32 +327,6 @@ class MerchantIntention extends BaseController 'id' => $id ] ]); - $areaInfo = Db::name('geo_area')->where('area_code', $data['area_id'] ?? '')->find(); - $sendData = [ - 'type' => 1, - 'type_name' => Db::name('merchant_type')->where('mer_type_id', $data['mer_type_id'])->value('type_name', ''), - 'category_name' => Db::name('merchant_category')->where('merchant_category_id', $data['merchant_category_id'])->value('category_name', ''), - 'mer_name' => $data['mer_name'] ?? '', - 'company_name' => $data['company_name'] ?? '', - 'organization_code' => $data['social_credit_code'] ?? '', - 'master_name' => $data['name'], - 'master_phone' => $data['phone'], - 'images' => !empty($data['images']) ? json_encode($data['images']) : '', - 'city' => $areaInfo['city_code'] ?? '', - 'area' => $data['area_id'] ?? '', - 'street' => $data['street_id'] ?? '', - 'village' => $data['village_id'] ?? '', - 'address' => $data['address'] ?? '', - 'mer_intention_id' => $id, - 'type_id'=>$data['mer_type_id']??'', - 'is_company'=>$data['is_company']??'', - - ]; - $postUrl = env('TASK_WORKER_HOST_URL') . '/adminapi/company/createShopMerchant'; - $res = $this->sendMerIntentionApply($sendData, $postUrl); - if (!$res['ok']) { - throw new ValidateException('供销平台申请商户入驻失败,' . $res['msg']); - } if($updateIntention){ return app('json')->success('修改成功'); }else{