From b5e0fe7101970c895efb43aa3d2ae0ed09be9931 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Tue, 16 Mar 2021 17:14:56 +0800
Subject: [PATCH] Update RebateCurrentService.php

---
 app/data/service/RebateCurrentService.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/data/service/RebateCurrentService.php b/app/data/service/RebateCurrentService.php
index 784e790d1..fec92d222 100644
--- a/app/data/service/RebateCurrentService.php
+++ b/app/data/service/RebateCurrentService.php
@@ -144,7 +144,7 @@ class RebateCurrentService extends Service
         // 批量发放配置奖励
         foreach (self::PRIZES as $vo) {
             if (method_exists($this, $vo['func'])) {
-                $this->app->log->notice("订单{$orderNo}发放{$vo['func']}奖励");
+                $this->app->log->notice("订单 {$orderNo} 发放 [{$vo['func']}] {$vo['name']}");
                 $this->{$vo['func']}();
             }
         }
@@ -299,12 +299,11 @@ class RebateCurrentService extends Service
      */
     private function _prize05(): bool
     {
-        return false;
         $puids = array_reverse(explode('-', trim($this->user['path'], '-')));
         if (empty($puids) || $this->order['amount_total'] <= 0) return false;
         // 获取可以参与奖励的代理
         $sql = $this->app->db->name('DataUserUpgrade')->field('number')->whereLike('rebate_rule', '%,' . self::PRIZE_05 . ',%')->buildSql(true);
-        $users = $this->app->db->name('DataUser')->where("vip_code in {$sql}")->whereIn('id', $puids)->orderField('id', $puids)->select()->toArray();
+        $users = $this->app->db->name('DataUser')->whereRaw("vip_code in {$sql}")->whereIn('id', $puids)->orderField('id', $puids)->select()->toArray();
         // 查询需要计算奖励的商品
         $map = [['order_no', '=', $this->order['order_no']], ['discount_rate', '<', 100]];
         foreach ($this->app->db->name('StoreOrderItem')->where($map)->cursor() as $item) {
@@ -345,14 +344,13 @@ class RebateCurrentService extends Service
      */
     private function _prize06(): bool
     {
-        return false;
         $puids = array_reverse(explode('-', trim($this->user['path'], '-')));
         if (empty($puids) || $this->order['amount_total'] <= 0) return false;
         // 记录原始等级
         $prevLevel = $this->user['vip_code'];
         // 获取可以参与奖励的代理
         $subsql = $this->app->db->name('DataUserUpgrade')->field('number')->whereLike('rebate_rule', '%,' . self::PRIZE_06 . ',%')->buildSql(true);
-        foreach ($this->app->db->name('DataUser')->where("vip_code in {$subsql}")->whereIn('id', $puids)->orderField('id', $puids)->cursor() as $user) {
+        foreach ($this->app->db->name('DataUser')->whereRaw("vip_code in {$subsql}")->whereIn('id', $puids)->orderField('id', $puids)->cursor() as $user) {
             if ($user['vip_code'] > $prevLevel) {
                 if (($amount = $this->_prize06amount($prevLevel, $user['vip_code'])) > 0.00) {
                     $map = ['type' => self::PRIZE_06, 'order_no' => $this->order['order_no'], 'order_uid' => $this->order['uid']];