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

更新修复异常

Browse Source
This commit is contained in:
yaooo 2023-09-14 15:08:16 +08:00
parent 1b123432d8
commit db02424721
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,7 +215,7 @@ class Auth extends BaseController
$data['mer_info'] = $mer_arr;
$typCode = Db::name('merchant_type')->where('mer_type_id', $mer_arr['type_id'] ?? 0)->value('type_code');
$data['mer_info']['type_code'] = $typCode;
if ($mer_arr['create_time'] == $mer_arr['update_time']) {
if (($mer_arr['create_time'] ?? '') == ($mer_arr['update_time'] ?? '')) {
$data['mer_info']['setup_status'] = 0;
} else {
$data['mer_info']['setup_status'] = 1;
@ -1354,10 +1354,11 @@ class Auth extends BaseController
//同步商户状态信息
public function merchantStatus($id)
{
Log::info("接收到同步商户状态HOST：" . request()->url());
Log::info("接收到同步商户状态HOST：" . request()->host() . request()->url());
Log::info("接收到同步商户状态数据：" . json_encode(request()->param()));
$repository = app()->make(MerchantIntentionRepository::class);
if (!$repository->getWhereCount(['mer_intention_id' => $id, 'is_del' => 0]))
return app('json')->fail('数据不存在');
return app('json')->fail('数据不存在');
$param = $this->request->params(['status']);
$data['status'] = $param['status'];
$data['create_mer'] = -1;