Merge pull request 'dev' (#154) from dev into master

Reviewed-on: #154

app/common/repositories/system/merchant/MerchantIntentionRepository.php

@@ -172,7 +172,7 @@ class MerchantIntentionRepository extends BaseRepository
         }
         Db::transaction(function () use ($config, $intention, $data, $create,$margin,$merData,$smsData,$autoCreate) {
             if ($data['status'] == 1) {
-                if ($create) {
+                if ($create && $intention['type'] == 1) {
                     $merchant = app()->make(MerchantRepository::class)->createMerchant($merData);
                     $data['mer_id'] = $merchant->mer_id;
                     $data['uid'] = $intention['uid'];
@@ -193,9 +193,8 @@ class MerchantIntentionRepository extends BaseRepository
                     $store_service_data['phone'] = $intention['phone'];
                     $store_service_data['create_time'] = date('Y-m-d H:i:s');
                     Db::name('store_service')->insert($store_service_data);
-
-                    Queue::push(SendSmsJob::class, ['tempId' => 'APPLY_MER_SUCCESS', 'id' => $smsData]);
                 }
+                Queue::push(SendSmsJob::class, ['tempId' => 'APPLY_MER_SUCCESS', 'id' => $smsData]);
             } else {
                 Queue::push(SendSmsJob::class, ['tempId' => 'APPLY_MER_FAIL', 'id' => $smsData]);
             }

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('提交成功');
     }
 
@@ -220,19 +194,6 @@ class MerchantIntention extends BaseController
         if (!empty($merInfo['business_status']) && ($merInfo['business_status'] == 2)) {
             return app('json')->fail('商户交易申请已通过');
         }
-        $intenInfo = Db::name('merchant_intention')->where('mer_intention_id', $merInfo['mer_intention_id'] ?? 0)->where('type', 1)->find();
-        if (empty($intenInfo)) {
-            // 兼容处理已开通商户
-            $intenInfo = [
-                'uid'        => $merInfo['uid'],
-                'mer_id'     => $merInfo['mer_id'],
-                'phone'      => $merInfo['mer_phone'],
-                'mer_name'   => $merInfo['mer_name'],
-                'name'   => $merInfo['mer_name'],
-                'merchant_category_id' => $merInfo['category_id'],
-                'mer_type_id'          => $merInfo['type_id'],
-            ];
-        }
         $intenInfo['bank_username'] = $data['bank_username'];
         $intenInfo['bank_opening'] = $data['bank_opening'];
         $intenInfo['bank_code'] = $data['bank_code'];
@@ -240,49 +201,10 @@ class MerchantIntention extends BaseController
         $intenInfo['bank_back'] = $data['bank_back'];
         $intenInfo['cardno_front'] = $data['cardno_front'];
         $intenInfo['cardno_back'] = $data['cardno_back'];
-
         $intenInfo['type'] = 2;
         $intenInfo['status'] = 0;
         $intenInfo['create_time'] = date('Y-m-d H:i:s');
-
-        unset($intenInfo['mer_intention_id']);
-
-        $intentionId = Db::name('merchant_intention')->insertGetId($intenInfo);
-        $areaInfo = Db::name('geo_area')->where('area_code', $intenInfo['area_id'] ?? '')->find();
-        $sendData = [
-            'type' => 2,
-            'type_name' => Db::name('merchant_type')->where('mer_type_id', $merInfo['type_id'])->value('type_name', ''),
-            'category_name' => Db::name('merchant_category')->where('merchant_category_id', $merInfo['category_id'])->value('category_name', ''),
-            'mer_name' => $intenInfo['mer_name'] ?? '',
-            'company_name' => $intenInfo['company_name'] ?? '',
-            'organization_code' => $intenInfo['social_credit_code'] ?? '',
-            'master_name' => $intenInfo['name'],
-            'master_phone' => $intenInfo['phone'],
-            'images' => !empty($intenInfo['images']) ? json_encode(explode(',', $intenInfo['images'])) : '',
-            'city' => $areaInfo['city_code'] ?? '',
-            'area' => $merInfo['area_id'] ?? '',
-            'street' =>  $merInfo['street_id'] ?? '',
-            'village' =>  $data['village_id'] ?? '',
-            'address' =>  $intenInfo['address'] ?? '',
-            'bank_username' => $data['bank_username'] ?? '',
-            'bank_opening' => $data['bank_opening'] ?? '',
-            'bank_code' => $data['bank_code'] ?? '',
-            'bank_front' => $data['bank_front'] ?? '',
-            'bank_back' => $data['bank_back'] ?? '',
-            'cardno_front' => $data['cardno_front'] ?? '',
-            'cardno_back' => $data['cardno_back'] ?? '',
-            'mer_intention_id' =>  $intentionId,
-            'type_id'=>$merInfo['type_id']??'',
-            'is_company'=>$intenInfo['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', $intentionId)->delete();
-            throw new ValidateException('供销平台商户交易申请失败，' . $res['msg']);
-        }
-        Db::name('merchant')->where('uid', $this->userInfo->uid)->where('status', 1)->update(['business_status' => 1]);
+        $this->repository->create($intenInfo);
         return app('json')->success('申请成功');
     }
 
@@ -353,32 +275,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{

public/index.html

@@ -2,4 +2,4 @@
             document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
 						if(window.location.protocol == 'https:'){
 							document.write('<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">')
-						}</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.3822bc6e.js></script><script src=/static/js/index.e5ed9214.js></script></body></html>
+						}</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.c6349b23.js></script><script src=/static/js/index.19ab3404.js></script></body></html>