mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整商户交易开通申请

Browse Source
This commit is contained in:
luofei 2024-02-27 16:29:05 +08:00
parent 92cebd2e5a
commit 30027973a6
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/common/repositories/system/merchant/MerchantIntentionRepository.php
View File

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

18
app/controller/api/store/merchant/MerchantIntention.php
View File

@ -194,19 +194,6 @@ class MerchantIntention extends BaseController
if (!empty($merInfo['business_status']) && ($merInfo['business_status'] == 2)) { if (!empty($merInfo['business_status']) && ($merInfo['business_status'] == 2)) {
return app('json')->fail('商户交易申请已通过'); 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_username'] = $data['bank_username'];
$intenInfo['bank_opening'] = $data['bank_opening']; $intenInfo['bank_opening'] = $data['bank_opening'];
$intenInfo['bank_code'] = $data['bank_code']; $intenInfo['bank_code'] = $data['bank_code'];
@ -214,13 +201,10 @@ class MerchantIntention extends BaseController
$intenInfo['bank_back'] = $data['bank_back']; $intenInfo['bank_back'] = $data['bank_back'];
$intenInfo['cardno_front'] = $data['cardno_front']; $intenInfo['cardno_front'] = $data['cardno_front'];
$intenInfo['cardno_back'] = $data['cardno_back']; $intenInfo['cardno_back'] = $data['cardno_back'];
$intenInfo['type'] = 2; $intenInfo['type'] = 2;
$intenInfo['status'] = 0; $intenInfo['status'] = 0;
$intenInfo['create_time'] = date('Y-m-d H:i:s'); $intenInfo['create_time'] = date('Y-m-d H:i:s');
$this->repository->create($intenInfo);
unset($intenInfo['mer_intention_id']);
Db::name('merchant')->where('uid', $this->userInfo->uid)->where('status', 1)->update(['business_status' => 1]);
return app('json')->success('申请成功'); return app('json')->success('申请成功');
} }