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 2023-11-04 19:39:53 +08:00
parent e34bd3df99
commit 4621219000
1 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,7 +87,7 @@ class MerchantIntention extends BaseController
'organization_code' => $data['social_credit_code'] ?? '',
'master_name' => $data['name'],
'master_phone' => $data['phone'],
'images' => !empty($data['images'])?json_encode($data['images']):'',
'images' => !empty($data['images']) ? json_encode($data['images']) : '',
'city' => $areaInfo['city_code'] ?? '',
'area' => $data['area_id'] ?? '',
'street' => $data['street_id'] ?? '',
@ -108,7 +108,7 @@ class MerchantIntention extends BaseController
$status = $this->request->post('status', 0);
if ($this->userInfo) $data['uid'] = $this->userInfo->uid;
if ($status == 1) {
Db::name('merchant')->where('uid', $this->userInfo->uid)->update(['mer_settlement_agree_status'=>1]);
Db::name('merchant')->where('uid', $this->userInfo->uid)->update(['mer_settlement_agree_status' => 1]);
}
return app('json')->success('操作成功');
}
@ -150,10 +150,10 @@ class MerchantIntention extends BaseController
if (empty($merInfo)) {
return app('json')->fail('请申请商户入驻申请！');
}
if (!empty($merInfo['business_status']) && ($merInfo['business_status']==1)) {
if (!empty($merInfo['business_status']) && ($merInfo['business_status'] == 1)) {
return app('json')->fail('商户交易已申请，正在审核中！');
}
if (!empty($merInfo['business_status']) && ($merInfo['business_status']==2)) {
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();
@ -191,7 +191,7 @@ class MerchantIntention extends BaseController
'organization_code' => $intenInfo['social_credit_code'] ?? '',
'master_name' => $intenInfo['name'],
'master_phone' => $intenInfo['phone'],
'images' => !empty($intenInfo['images'])?json_encode(explode(',', $intenInfo['images'])):'',
'images' => !empty($intenInfo['images']) ? json_encode(explode(',', $intenInfo['images'])) : '',
'city' => $areaInfo['city_code'] ?? '',
'area' => $merInfo['area_id'] ?? '',
'street' => $merInfo['street_id'] ?? '',
@ -210,7 +210,7 @@ class MerchantIntention extends BaseController
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]);
Db::name('merchant')->where('uid', $this->userInfo->uid)->where('status', 1)->update(['business_status' => 1]);
return app('json')->success('申请成功');
}
@ -234,7 +234,7 @@ class MerchantIntention extends BaseController
if (!empty($resData) && is_string($resData)) {
Log::info("商户申请反馈信息" . $resData);
$resInfo = json_decode($resData, true);
if(!empty($resInfo['code']) && $resInfo['code'] == 1){
if (!empty($resInfo['code']) && $resInfo['code'] == 1) {
$rtnData['ok'] = true;
} else {
$rtnData['msg'] = $resInfo['msg'];
@ -291,7 +291,7 @@ class MerchantIntention extends BaseController
'organization_code' => $data['social_credit_code'] ?? '',
'master_name' => $data['name'],
'master_phone' => $data['phone'],
'images' => !empty($data['images'])?json_encode($data['images']):'',
'images' => !empty($data['images']) ? json_encode($data['images']) : '',
'city' => $areaInfo['city_code'] ?? '',
'area' => $data['area_id'] ?? '',
'street' => $data['street_id'] ?? '',
@ -310,7 +310,7 @@ class MerchantIntention extends BaseController
{
[$page, $limit] = $this->getPage();
$type = $this->request->get('type', 1);
$data = $this->repository->getList(['uid' => $this->userInfo->uid, 'type'=>$type], $page, $limit);
$data = $this->repository->getList(['uid' => $this->userInfo->uid, 'type' => $type], $page, $limit);
return app('json')->success($data);
}
@ -336,7 +336,7 @@ class MerchantIntention extends BaseController
'name',
'code',
'images',
'merchant_category_id',
'merchant_category_name',
'mer_type_id',
'social_credit_code',
'area_id',
@ -352,8 +352,17 @@ class MerchantIntention extends BaseController
if (!$check) throw new ValidateException('验证码不正确');
}
if (!app()->make(MerchantCategoryRepository::class)->get($data['merchant_category_id'])) throw new ValidateException('商户分类不存在');
if ($data['mer_type_id'] && !app()->make(MerchantTypeRepository::class)->exists($data['mer_type_id']))
if ($data['mer_type_id'] && !app()->make(MerchantTypeRepository::class)->exists($data['mer_type_id'])) {
throw new ValidateException('店铺类型不存在');
}
if ($data['merchant_category_name'] == '') {
throw new ValidateException('商户分类，不能为空');
}
$merchant_category_id=Db::name('merchant_category')->where('category_name',$data['merchant_category_name'])->value('merchant_category_id');
if(!$merchant_category_id){
throw new ValidateException('没有对应的商户分类,请联系工作人员添加');
}
$data['merchant_category_id']=$merchant_category_id;
unset($data['code']);
return $data;
}
@ -392,4 +401,3 @@ class MerchantIntention extends BaseController
return app('json')->success($lst);
}
}