From 80e8ee9bbd336633324450be9f64f27668478df0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Thu, 11 Mar 2021 17:57:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A5=96=E5=8A=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/controller/api/auth/Order.php    | 2 +-
 app/data/service/RebateCurrentService.php | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/data/controller/api/auth/Order.php b/app/data/controller/api/auth/Order.php
index 642efe7be..f69036b58 100644
--- a/app/data/controller/api/auth/Order.php
+++ b/app/data/controller/api/auth/Order.php
@@ -289,7 +289,7 @@ class Order extends Auth
             $openid = '';
             if (in_array($this->type, [UserService::APITYPE_WXAPP, UserService::APITYPE_WECHAT])) {
                 $openid = $this->user[UserService::TYPES[$this->type]['auth']] ?? '';
-                if (empty($openid)) $this->error("发起支付失败");
+                // if (empty($openid)) $this->error("发起支付失败");
             }
             // 返回订单数据及支付发起参数
             $type = $order['amount_real'] <= 0 ? 'empty' : $data['payment_code'];
diff --git a/app/data/service/RebateCurrentService.php b/app/data/service/RebateCurrentService.php
index d89cff144..8d3ec6dc5 100644
--- a/app/data/service/RebateCurrentService.php
+++ b/app/data/service/RebateCurrentService.php
@@ -221,11 +221,9 @@ class RebateCurrentService extends Service
         $pids = array_reverse(explode('-', trim($this->user['path'], '-')));
         if (empty($pids)) return false;
         // 获取拥有差额奖励的等级
-        $query = $this->app->db->name('DataUserUpgrade');
-        $numbs = $query->whereLike('rule', '%,' . self::PRIZE_05 . ',%')->column('number');
+        $numbs = $this->app->db->name('DataUserUpgrade')->whereLike('rebate_rule', '%,' . self::PRIZE_05 . ',%')->column('number');
         // 获取可以参与奖励的代理
-        $query = $this->app->db->name('DataUser')->whereIn('vip_number', $numbs);
-        $users = $query->whereIn('id', $pids)->orderField('id', $pids)->select()->toArray();
+        $users = $this->app->db->name('DataUser')->whereIn('vip_number', $numbs)->whereIn('id', $pids)->orderField('id', $pids)->select()->toArray();
         // 查询需要计算奖励的商品
         $map = [['order_no', '=', $this->order['order_no']], ['discount_rate', '<', 100]];
         $this->app->db->name('StoreOrderItem')->where($map)->select()->each(function ($item) use ($users) {