From 59ca8dd82665785518a7afe03f6c5e2149fac03a Mon Sep 17 00:00:00 2001
From: Gosowong <1329847115@qq.com>
Date: Fri, 19 May 2023 16:11:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BC=9A=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/listener/order/OrderShippingListener.php | 2 +-
 crmeb/app/services/order/OtherOrderServices.php    | 1 +
 crmeb/app/services/user/UserRechargeServices.php   | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crmeb/app/listener/order/OrderShippingListener.php b/crmeb/app/listener/order/OrderShippingListener.php
index a49da8677..d140a9aa7 100644
--- a/crmeb/app/listener/order/OrderShippingListener.php
+++ b/crmeb/app/listener/order/OrderShippingListener.php
@@ -46,7 +46,7 @@ class OrderShippingListener implements ListenerInterface
                     return;
                 }
             } else if ($order_type == 'recharge') {  // 充值订单
-                if ($order['recharge_type'] == 'routine' && $order['paid'] == 1) {
+                if ($order['recharge_type'] == 'weixin') {
                     $delivery_type = 3;
                     $item_desc = '用户充值' . $order['price'];
                     $out_trade_no = $order['order_id'];
diff --git a/crmeb/app/services/order/OtherOrderServices.php b/crmeb/app/services/order/OtherOrderServices.php
index 92e547b17..fbd440d92 100644
--- a/crmeb/app/services/order/OtherOrderServices.php
+++ b/crmeb/app/services/order/OtherOrderServices.php
@@ -346,6 +346,7 @@ class OtherOrderServices extends BaseServices
             if ($spread_two && $spread_two_price > 0) $this->memberBrokerage($spread_two, $spread_two_price, 'get_two_member_brokerage', $orderInfo);
         }
 
+        $orderInfo['pay_type'] = $paytype;
         // 小程序订单服务
         event('OrderShipping', ['member', $orderInfo, 3, '', '']);
         return false !== $res;
diff --git a/crmeb/app/services/user/UserRechargeServices.php b/crmeb/app/services/user/UserRechargeServices.php
index 5945b8392..267d78422 100644
--- a/crmeb/app/services/user/UserRechargeServices.php
+++ b/crmeb/app/services/user/UserRechargeServices.php
@@ -494,7 +494,6 @@ class UserRechargeServices extends BaseServices
         event('NoticeListener', [['order' => $order, 'now_money' => $now_money], 'recharge_success']);
 
         $order['pay_type'] = $other['pay_type'];
-        $order['paid'] = 1;
         // 小程序订单服务
         event('OrderShipping', ['recharge', $order, 3, '', '']);
         return true;