From 47a0799f6ae857673150efbef5aaaf5c44fbb7cb Mon Sep 17 00:00:00 2001 From: liapples Date: Mon, 13 Sep 2021 15:32:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E5=88=86=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/AgentInfoController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/AgentInfoController.php b/app/Http/Controllers/Api/AgentInfoController.php index 7c7db8b..c6f6ddd 100644 --- a/app/Http/Controllers/Api/AgentInfoController.php +++ b/app/Http/Controllers/Api/AgentInfoController.php @@ -11,7 +11,7 @@ class AgentInfoController extends Controller { public function info() { - $type = request()->route('type');; + $type = request()->route('type'); //关于我们、注册协议、购买协议 if (!in_array($type, ['about', 'reg_protocol', 'buy_protocol'])) { return $this->error('参数无效'); From e59bdfcb3f272058e1b026e6a45250451977d7d1 Mon Sep 17 00:00:00 2001 From: liapples Date: Mon, 13 Sep 2021 16:29:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routes/api.php | 1 + 1 file changed, 1 insertion(+) diff --git a/routes/api.php b/routes/api.php index 0035c14..c6bace0 100644 --- a/routes/api.php +++ b/routes/api.php @@ -34,6 +34,7 @@ Route::namespace('App\Http\Controllers\Api')->group(function () { # 小程序授权等相关 Route::any('auth_event', 'MiniProgramController@authEvent'); + Route::any('msg_event/{appid?}', 'MiniProgramController@msgEvent'); }); # 仅用于测试 From 39d1348fa31bac889b87841588bd6e6110b97963 Mon Sep 17 00:00:00 2001 From: liapples Date: Mon, 13 Sep 2021 17:00:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=87=91=E9=A2=9D=E6=AD=A3=E8=B4=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/AdminAgent/Extensions/Grid/AuditRefund.php | 2 +- app/Http/Controllers/Api/WxpayController.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/AdminAgent/Extensions/Grid/AuditRefund.php b/app/AdminAgent/Extensions/Grid/AuditRefund.php index 4398b34..02e9e4f 100644 --- a/app/AdminAgent/Extensions/Grid/AuditRefund.php +++ b/app/AdminAgent/Extensions/Grid/AuditRefund.php @@ -85,7 +85,7 @@ class AuditRefund extends RowAction // 参数分别为：微信订单号、商户退款单号、订单金额、退款金额、其他参数 foreach ($log as $k=>$v) { $refund_no = $order->refund_info['refund_no'] . '-' . $v['id']; - $money = intval(0 - $v->money * 100); + $money = intval($v->money * 100); $result = $app->refund->byTransactionId($v->transaction_id, $refund_no, $money, $money); //存入UserMoneyLog diff --git a/app/Http/Controllers/Api/WxpayController.php b/app/Http/Controllers/Api/WxpayController.php index f84494e..d9145d9 100644 --- a/app/Http/Controllers/Api/WxpayController.php +++ b/app/Http/Controllers/Api/WxpayController.php @@ -115,7 +115,7 @@ class WxpayController UserMoneyLog::query()->create([ 'user_id' => $order->user_id, 'agent_id' => $order->agent_id, - 'money' => -$money, + 'money' => $money, 'order_id' => $order->id, 'type' => 1, 'desc' => DB::raw("LEFT('购买产品：{$order->title}', 250)"), @@ -219,7 +219,7 @@ class WxpayController UserMoneyLog::create([ 'user_id' => $order->user_id, 'agent_id' => $order->agent_id, - 'money' => $reqInfo['settlement_refund_fee'] / 100, + 'money' => -$reqInfo['settlement_refund_fee'] / 100, 'order_id' => $order->id, 'type' => 2, 'desc' => DB::raw("LEFT('退款：{$order->title}', 250)"),