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

更新

Browse Source
This commit is contained in:
mkm 2024-01-12 10:19:35 +08:00
parent 17c5633f73
commit b0225a3e4d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,7 +140,7 @@ class MerchantIntentionRepository extends BaseRepository
// 用户需缴纳押金 // 用户需缴纳押金
'margin' => $margin['margin'] ?? 0, 'margin' => $margin['margin'] ?? 0,
'uid' => $intention['uid'], 'uid' => $intention['uid'],
'reg_admin_id' => $autoCreate ? 0: request()->adminId(), 'reg_admin_id' => 0,
'mer_intention_id' => $id, 'mer_intention_id' => $id,
'is_company'=>$intention['is_company'], 'is_company'=>$intention['is_company'],
]; ];

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

@ -135,7 +135,7 @@ class MerchantIntention extends BaseController
if ($adminRepository->fieldExists('account', $data['phone'])) if ($adminRepository->fieldExists('account', $data['phone']))
throw new ValidateException('手机号已是管理员，不可申请'); throw new ValidateException('手机号已是管理员，不可申请');
$mer_type_id=Db::name('merchant_type')->where('type_code','PersonalStore')->value('mer_type_id'); $mer_type_id=Db::name('merchant_type')->where('type_code','PersonalStore')->value('mer_type_id');
$data['status']=1; $data['status']=0;
$data['mer_type_id']=$mer_type_id; $data['mer_type_id']=$mer_type_id;
$intention = $this->repository->create($data); $intention = $this->repository->create($data);
if($intention){ if($intention){