From 4f894aab1bc84034f0a70013bf2c577e53823038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Mon, 5 Aug 2024 22:41:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8F=90=E7=8E=B0=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E5=8F=B7=E5=AD=98=E5=9C=A8=E6=97=B6=E4=B8=8D=E5=86=8D=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/think-plugs-wemall/src/controller/user/Transfer.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugin/think-plugs-wemall/src/controller/user/Transfer.php b/plugin/think-plugs-wemall/src/controller/user/Transfer.php index de0b941b1..d7deca0ed 100644 --- a/plugin/think-plugs-wemall/src/controller/user/Transfer.php +++ b/plugin/think-plugs-wemall/src/controller/user/Transfer.php @@ -132,7 +132,9 @@ class Transfer extends Controller if (in_array($data['status'], [0, 1, 2, 3])) { $data['last_at'] = date('Y-m-d H:i:s'); } elseif ($data['status'] == 4) { - $data['trade_no'] = CodeExtend::uniqidDate(20); + if (empty($find['trade_no'])) { + $data['trade_no'] = CodeExtend::uniqidDate(20); + } $data['trade_time'] = date('Y-m-d H:i:s'); $data['change_time'] = date('Y-m-d H:i:s'); $data['change_desc'] = ($data['remark'] ?: '线下打款成功') . ' By ' . AdminService::getUserName();