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-06-28 11:05:04 +08:00
parent 38b13fa15b
commit 51acc25e87
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -101,7 +101,7 @@ class MerchantRepository extends BaseRepository
$query->field('uid,nickname,avatar'); $query->field('uid,nickname,avatar');
}, },
]) ])
->field('resource_shareholders_uid,merchant_type,sort,mer_id,mer_name,real_name,mer_phone,mer_address,mark,status,create_time,is_best,is_trader,type_id,category_id,copy_product_num,export_dump_num,is_margin,margin,ot_margin,mer_avatar,margin_remind_time,agent_id,shop_mer_id,brand_id') ->field('merchant_sub_type,resource_shareholders_uid,merchant_type,sort,mer_id,mer_name,real_name,mer_phone,mer_address,mark,status,create_time,is_best,is_trader,type_id,category_id,copy_product_num,export_dump_num,is_margin,margin,ot_margin,mer_avatar,margin_remind_time,agent_id,shop_mer_id,brand_id')
->select(); ->select();
return compact('count', 'list'); return compact('count', 'list');
} }

1
app/controller/admin/system/merchant/Merchant.php
View File

@ -232,6 +232,7 @@ class Merchant extends BaseController
'brand_id', 'brand_id',
['resource_shareholders_uid',0], ['resource_shareholders_uid',0],
['resource_shareholders_rate',0], ['resource_shareholders_rate',0],
['merchant_sub_type',0],
]); ]);
$data['mer_label'] = str_replace('，',',',$data['mer_label']); $data['mer_label'] = str_replace('，',',',$data['mer_label']);
if (!$isUpdate) { if (!$isUpdate) {

12
app/controller/api/Auth.php
View File

@ -786,18 +786,18 @@ class Auth extends BaseController
* @return mixed * @return mixed
*/ */
public function searchUser(){ public function searchUser(){
$search = $this->request->params(['id_and_phone']); $idAndPhone = $this->request->param('id_and_phone', 0);
$userInfo = app()->make(UserRepository::class) $userInfo = app()->make(UserRepository::class)
->getSearch([]) ->getSearch([])
->field(['uid','real_name','nickname','avatar','phone']) ->field(['uid','real_name','nickname','avatar','phone'])
->whereNull('cancel_time') ->whereNull('cancel_time')
// 用户ID/联系电话 ->where(function($query) use ($idAndPhone){
->when(!empty($search['id_and_phone']),function($query) use ($search){ $query->where('uid',$idAndPhone)->whereOr(function($sql) use ($idAndPhone){
$query->where(function($query) use ($search){ $sql->where('phone',$idAndPhone)->whereNull('phone');
$query->where('uid',$search['id_and_phone'])->whereOr('phone',$search['id_and_phone']);
}); });
}) })
->findOrEmpty(); ->findOrEmpty()
->toArray();
return app('json')->success($userInfo); return app('json')->success($userInfo);
} }

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

@ -99,7 +99,7 @@ class MerchantIntention extends BaseController
// 接收参数处理 // 接收参数处理
protected function checkParams($id = 0){ protected function checkParams($id = 0){
// 参数获取 // 参数获取
$data = $this->request->params(['phone','mer_name','name','code','images','merchant_category_id','mer_type_id','manage_uid',['agent_id', 0],['merchant_type',0]]); $data = $this->request->params(['phone','mer_name','name','code','images','merchant_category_id','mer_type_id','manage_uid',['agent_id', 0],['merchant_type',0],['merchant_sub_type',0]]);
app()->make(MerchantIntentionValidate::class)->check($data); app()->make(MerchantIntentionValidate::class)->check($data);
// $check = app()->make(SmsService::class)->checkSmsCode($data['phone'],$data['code'],'intention'); // $check = app()->make(SmsService::class)->checkSmsCode($data['phone'],$data['code'],'intention');
$data['mer_type_id'] = (int)$data['mer_type_id']; $data['mer_type_id'] = (int)$data['mer_type_id'];