Gosowong 2 лет назад
Родитель
Сommit
59ca8dd826

+ 1 - 1
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'];

+ 1 - 0
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;

+ 0 - 1
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;