From 140cfe5d2b3f7d58ea795caa32f443e8e20b8eed Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Thu, 24 Mar 2022 16:12:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v1/admin/StoreOrderController.php          |  1 +
 .../notice/WechatTemplateListService.php       | 18 +++++++++---------
 .../app/services/user/UserRechargeServices.php |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/crmeb/app/api/controller/v1/admin/StoreOrderController.php b/crmeb/app/api/controller/v1/admin/StoreOrderController.php
index 764b426c..de9adb6c 100644
--- a/crmeb/app/api/controller/v1/admin/StoreOrderController.php
+++ b/crmeb/app/api/controller/v1/admin/StoreOrderController.php
@@ -538,6 +538,7 @@ class StoreOrderController
             ['time', ''],
             ['refund_type', 0],
         ]);
+        $where['is_cancel'] = 0;
         $data = $services->refundList($where)['list'];
         return app('json')->success($data);
     }
diff --git a/crmeb/app/services/message/notice/WechatTemplateListService.php b/crmeb/app/services/message/notice/WechatTemplateListService.php
index 508afb74..3406d210 100644
--- a/crmeb/app/services/message/notice/WechatTemplateListService.php
+++ b/crmeb/app/services/message/notice/WechatTemplateListService.php
@@ -141,8 +141,8 @@ class WechatTemplateListService extends NoticeService
     {
         return $this->sendTemplate('ORDER_POSTAGE_SUCCESS', $uid, [
             'keyword1' => $order['order_id'],
-            'keyword2' => $data['delivery_name'],
-            'keyword3' => $data['delivery_id'],
+            'keyword2' => $order['delivery_name'],
+            'keyword3' => $order['delivery_id'],
             'first' => '亲,您的订单已发货,请注意查收',
             'remark' => '点击查看订单详情'
         ], '/pages/users/order_details/index?order_id=' . $order['order_id']);
@@ -213,19 +213,19 @@ class WechatTemplateListService extends NoticeService
 
     /**
      * 发送退款模板消息
-     * @param array $data
+     * @param $data
      * @param $order
      * @return bool|mixed
      */
-    public function sendOrderRefundSuccess($uid, array $data, $order)
+    public function sendOrderRefundSuccess($uid, $data, $order)
     {
         return $this->sendTemplate('ORDER_REFUND_STATUS', $uid, [
             'first' => '亲，您购买的商品已退款,本次退款' . $data['refund_price'] . '金额',
-            'keyword1' => $order['order_id'],
+            'keyword1' => $data['order_id'],
             'keyword2' => $order['pay_price'],
             'keyword3' => date('Y-m-d H:i:s', $order['add_time']),
             'remark' => '点击查看订单详情'
-        ], '/pages/users/order_details/index?order_id=' . $order['order_id']);
+        ], '/pages/users/order_details/index?order_id=' . $data['order_id'] . '&isReturen=1');
     }
 
     /**
@@ -242,16 +242,16 @@ class WechatTemplateListService extends NoticeService
             'keyword2' => $order['pay_price'],
             'keyword3' => date('Y-m-d H:i:s', $order['add_time']),
             'remark' => '点击查看订单详情'
-        ], '/pages/users/order_details/index?order_id=' . $order['order_id']);
+        ], '/pages/users/order_details/index?order_id=' . $order['order_id'] . '&isReturen=1');
     }
 
     /**
      * 发送用户充值退款模板消息
-     * @param array $data
+     * @param $data
      * @param $userRecharge
      * @return bool|mixed
      */
-    public function sendRechargeRefundStatus($uid, array $data, $userRecharge)
+    public function sendRechargeRefundStatus($uid, $data, $userRecharge)
     {
         return $this->sendTemplate('ORDER_REFUND_STATUS', $uid, [
             'first' => '亲，您充值的金额已退款,本次退款' .
diff --git a/crmeb/app/services/user/UserRechargeServices.php b/crmeb/app/services/user/UserRechargeServices.php
index 076a0e63..2da76c5c 100644
--- a/crmeb/app/services/user/UserRechargeServices.php
+++ b/crmeb/app/services/user/UserRechargeServices.php
@@ -257,7 +257,7 @@ class UserRechargeServices extends BaseServices
         $userMoneyServices->income('user_recharge_refund', $UserRecharge['uid'], $number, $now_money, $id);
 
         //提醒推送
-        event('notice.notice', [['user_type' => strtolower($UserRecharge['recharge_type']), 'data' => $data, 'UserRecharge' => $UserRecharge, 'now_money' => $refund_price], 'recharge_order_refund_status']);
+        event('notice.notice', [['user_type' => strtolower($userInfo['user_type']), 'data' => $data, 'UserRecharge' => $UserRecharge, 'now_money' => $refund_price], 'recharge_order_refund_status']);
         return true;
     }