Merge branch 'feat_agree' into dev

This commit is contained in:
yaooo 2023-09-22 11:20:57 +08:00
commit 5172d123ee

View File

@ -1391,6 +1391,9 @@ class Auth extends BaseController
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)]);
if ($status == 1) {
Db::name('merchant')->where('mer_id', $merId)->update(['mer_settlement_agree_status'=>1]);
}
}
return app('json')->success('同步成功');