diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php index 9bf94fb6..64a5a6e6 100644 --- a/app/controller/api/Auth.php +++ b/app/controller/api/Auth.php @@ -1363,6 +1363,7 @@ class Auth extends BaseController if (!$repository->getWhereCount(['mer_intention_id' => $id, 'is_del' => 0])) return app('json')->fail('数据不存在'); $status = $this->request->post('status', 0); + $remark = $this->request->post('remark', ''); $type = $this->request->post('type', 1); if ($type == 1) { //商户入驻申请 @@ -1372,7 +1373,13 @@ class Auth extends BaseController $repository->updateStatus($id, $data); } else { //商户交易申请 - Db::name('merchant_intention')->where('mer_intention_id', $id)->where('type', 2)->update(['status' => ($status == 1 ? 1 : 2)]); + //fail_msg + $updData = [ + 'status' => ($status == 1 ? 1 : 2), + 'fail_msg' => $remark + ]; + + Db::name('merchant_intention')->where('mer_intention_id', $id)->where('type', 2)->update($updData); $merId = Db::name('merchant_intention')->where('mer_intention_id', $id)->where('type', 2)->value('mer_id', 0); Db::name('merchant')->where('mer_id', $merId)->where('status', 1)->update(['business_status' => ($status == 1 ? 2 : 3)]); } diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php index a372e4da..1e7d6806 100644 --- a/app/controller/api/store/merchant/MerchantIntention.php +++ b/app/controller/api/store/merchant/MerchantIntention.php @@ -178,8 +178,8 @@ class MerchantIntention extends BaseController $merIntentionInfo = $this->repository->getWhere(['mer_intention_id' => (int)$id, 'uid' => $this->userInfo->uid, 'is_del' => 0]); if (!$merIntentionInfo) return app('json')->fail('数据不存在'); - if ($merIntentionInfo['status']) { - return app('json')->fail('已审核数据不能修改'); + if ($merIntentionInfo['status'] == 1) { + return app('json')->fail('已通过审核数据不能修改'); } $data = $this->checkParams(); if (!systemConfig('mer_intention_open')) {