wanma-benteng
/
new-admin-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加：酒道馆申请入驻及审核

This commit is contained in:
wuhui_zzw 2024-03-27 11:41:47 +08:00
parent 8eb7a7d256
commit 67bb2aee3c
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/common/repositories/marketing/AgentRepository.php
View File

@ -98,6 +98,18 @@ class AgentRepository extends BaseRepository{
$path = 'pages/store/settled/index';
return app()->make(QrcodeService::class)->createQrCode($valueData,$path);
break;
case 'shopMer':
// 参数长度超过 简写：aid=agent_id；mt=merchant_type
$valueData = 'aid=' . $params['agent_id'].'&mt=1';
$path = 'pages/store/settled/index';
return app()->make(QrcodeService::class)->createQrCode($valueData,$path);
break;
case 'mer':
// 参数长度超过 简写：aid=agent_id；mt=merchant_type
$valueData = 'aid=' . $params['agent_id'].'&mt=0';
$path = 'pages/store/settled/index';
return app()->make(QrcodeService::class)->createQrCode($valueData,$path);
break;
}
throw new ValidateException('小程序码生成失败！');

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

@ -136,8 +136,9 @@ class MerchantIntentionRepository extends BaseRepository
'mer_password' => $password,
'is_margin' => $margin['is_margin'] ?? -1,
'margin' => $margin['margin'] ?? 0,
'agent_id' => $intention['agent_id'] ?? 0,
'merchant_type' => $intention['merchant_type'] ?? 0
'agent_id' => $intention['merchant_type'] == 1 ? 0 : $intention['agent_id'] ?? 0,// 酒道馆是合伙人邀请加入 不能直接绑定
'merchant_type' => $intention['merchant_type'] ?? 0,
'invite_agent_id' => $intention['agent_id'] ?? 0,
];
$data['fail_msg'] = '';
$smsData = [

2
app/controller/api/Agent.php
View File

@ -35,7 +35,7 @@ class Agent extends BaseController{
return app('json')->success($data);
}
/**
* Common: 二维码 - 供应商入驻二维码
* Common: 二维码
* Author: wu-hui
* Time: 2024/01/29 17:40
* @return mixed

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

@ -104,7 +104,7 @@ class MerchantIntention extends BaseController
// $check = app()->make(SmsService::class)->checkSmsCode($data['phone'],$data['code'],'intention');
$data['mer_type_id'] = (int)$data['mer_type_id'];
// if(!$check) throw new ValidateException('验证码不正确');
if((int)$data['merchant_type'] != 3){
if(!in_array((int)$data['merchant_type'],[1,3])){
// 判断：商户分类是否存在
$cateIsHas = app()->make(MerchantCategoryRepository::class)->get($data['merchant_category_id']);
if(!$cateIsHas) throw new ValidateException('商户分类不存在');