diff --git a/addons/shopro/controller/UserWalletApply.php b/addons/shopro/controller/UserWalletApply.php index 72b7b04..f79ca10 100644 --- a/addons/shopro/controller/UserWalletApply.php +++ b/addons/shopro/controller/UserWalletApply.php @@ -105,19 +105,19 @@ class UserWalletApply extends Base $resubmit = false; try { - \think\Db::transaction(function () use ($bindings, $userId, $form, $service, &$did, &$resubmit) { - foreach ($bindings as $binding) { - $huifu = $binding['huifu_onboard']; - if (!empty($huifu['can_submit'])) { - $service->submit($userId, $binding['role_type'], $binding['role_ref_id'], $form); - $did = true; - $resubmit = true; - } elseif (!empty($huifu['can_save_draft'])) { - $service->saveDraft($userId, $binding['role_type'], $binding['role_ref_id'], $form); - $did = true; - } + // 汇付 API 不放在 DB 事务内,避免长耗时锁表 + foreach ($bindings as $binding) { + $huifu = $binding['huifu_onboard']; + if (!empty($huifu['can_submit'])) { + $service->resubmit($userId, $binding['role_type'], $binding['role_ref_id'], $form); + $did = true; + $resubmit = true; + } elseif (!empty($huifu['can_save_draft'])) { + // 用户提交即直连汇付(不再只存 draft 等后台/定时任务) + $service->submit($userId, $binding['role_type'], $binding['role_ref_id'], $form); + $did = true; } - }); + } } catch (\InvalidArgumentException $e) { $this->error($e->getMessage()); } catch (\RuntimeException $e) { @@ -125,6 +125,11 @@ class UserWalletApply extends Base ? \addons\shopro_huifu\library\onboard\HuifuOnboardError::translate($e->getMessage()) : $e->getMessage(); $this->error($msg); + } catch (\Throwable $e) { + $msg = class_exists('\\addons\\shopro_huifu\\library\\onboard\\HuifuOnboardError') + ? \addons\shopro_huifu\library\onboard\HuifuOnboardError::translate($e->getMessage()) + : $e->getMessage(); + $this->error($msg ?: '提交汇付进件失败'); } if (!$did) { @@ -133,7 +138,7 @@ class UserWalletApply extends Base $msg = $resubmit ? '汇付进件已重新提交,请耐心等待审核' - : '进件资料已提交,请等待后台审核;审核通过后将自动提交汇付'; + : '已提交汇付进件,请耐心等待审核'; $this->success($msg, $this->resolveWalletOnboard($userId)); } diff --git a/addons/shopro/controller/commission/Agent.php b/addons/shopro/controller/commission/Agent.php index 5bb0ab6..777f176 100644 --- a/addons/shopro/controller/commission/Agent.php +++ b/addons/shopro/controller/commission/Agent.php @@ -289,7 +289,7 @@ class Agent extends Commission try { \think\Hook::listen('shopro_commission_apply_after', $hookParams); } catch (\Throwable $e) { - $failMsg = $huifuResubmit ? '汇付进件提交失败' : '进件资料保存失败'; + $failMsg = '汇付进件提交失败'; $this->error($e->getMessage() ?: $failMsg); } } @@ -297,13 +297,13 @@ class Agent extends Commission if ($huifuResubmit) { $msg = '汇付进件已重新提交,请耐心等待审核'; - } elseif ($canSaveHuifuDraft && !$applyStatus) { - $msg = '进件资料已保存,请等待后台审核;审核通过后将自动提交汇付'; + } elseif (!empty($huifuPayload)) { + $msg = '申请已提交,汇付进件已同步提交,请耐心等待审核'; } else { $msg = '申请已提交,请等待后台审核'; if (class_exists('\\addons\\shopro_huifu\\library\\onboard\\HuifuOnboardGate') && \addons\shopro_huifu\library\onboard\HuifuOnboardGate::isOnboardRequired()) { - $msg = '申请已提交,请等待后台审核;审核通过后请到「提现」页绑定进件资料'; + $msg = '申请已提交,请等待后台审核;通过后请到「提现」页完成汇付进件'; } } $this->success($msg, null); diff --git a/addons/shopro/controller/regional_agent/Agent.php b/addons/shopro/controller/regional_agent/Agent.php index ab14944..66a3c0a 100644 --- a/addons/shopro/controller/regional_agent/Agent.php +++ b/addons/shopro/controller/regional_agent/Agent.php @@ -119,11 +119,16 @@ class Agent extends RegionalAgent if ($status === AgentModel::STATUS_PENDING) { $msg = $huifuRequired - ? '申请已提交,请等待后台审核;审核通过后请到「提现」页绑定进件资料' + ? (!empty($huifuOnboard) + ? '申请已提交,汇付进件已同步提交,请耐心等待审核' + : '申请已提交,请等待后台审核;通过后请到「提现」页完成汇付进件') : '申请已提交,请等待后台审核'; } else { $msg = '申请已通过,您已成为该区域公司'; - if ($huifuRequired && class_exists('\\addons\\shopro_huifu\\library\\onboard\\HuifuOnboardGate')) { + if ($huifuRequired && !empty($huifuOnboard)) { + $msg = '申请已通过,汇付进件已同步提交,请耐心等待审核'; + } elseif ($huifuRequired && class_exists('\\addons\\shopro_huifu\\library\\onboard\\HuifuOnboardGate')) { + // 无随申请提交资料时,兜底尝试提交历史 draft \addons\shopro_huifu\library\onboard\HuifuOnboardGate::submitOnBusinessApproved( $userId, 'regional_agent', diff --git a/addons/shopro_huifu/application/admin/view/shopro_huifu/onboard/index.html b/addons/shopro_huifu/application/admin/view/shopro_huifu/onboard/index.html index aa31cae..81d52d7 100644 --- a/addons/shopro_huifu/application/admin/view/shopro_huifu/onboard/index.html +++ b/addons/shopro_huifu/application/admin/view/shopro_huifu/onboard/index.html @@ -21,7 +21,7 @@