From ba12b66e69637b75557c4cbc82ba372457425b0c 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, 16 Sep 2021 15:31:43 +0800
Subject: [PATCH] Update RebateService.php

---
 app/data/service/RebateService.php | 91 +++++++++++++++---------------
 1 file changed, 46 insertions(+), 45 deletions(-)

diff --git a/app/data/service/RebateService.php b/app/data/service/RebateService.php
index e7cfb4361..ddbf3976b 100644
--- a/app/data/service/RebateService.php
+++ b/app/data/service/RebateService.php
@@ -164,51 +164,6 @@ class RebateService extends Service
         return true;
     }
 
-    /**
-     * 检查等级是否有奖励
-     * @param string $prize 奖励规则
-     * @param integer $level 用户等级
-     * @return boolean
-     */
-    private function checkPrizeStatus(string $prize, int $level): bool
-    {
-        $query = BaseUserUpgrade::mk()->where(['number' => $level]);
-        return $query->whereLike('rebate_rule', "%,{$prize},%")->count() > 0;
-    }
-
-    /**
-     * 获取奖励名称
-     * @param string $prize
-     * @return string
-     */
-    public function name(string $prize): string
-    {
-        return self::PRIZES[$prize]['name'] ?? $prize;
-    }
-
-    /**
-     * 写返利记录
-     * @param int $uuid
-     * @param array $map
-     * @param string $name
-     * @param float $amount
-     */
-    private function writeRabate(int $uuid, array $map, string $name, float $amount)
-    {
-        DataUserRebate::mk()->insert(array_merge($map, [
-            'uuid'         => $uuid,
-            'date'         => date('Y-m-d'),
-            'code'         => CodeExtend::uniqidDate(20, 'R'),
-            'name'         => $name,
-            'amount'       => $amount,
-            'status'       => $this->status,
-            'order_no'     => $this->order['order_no'],
-            'order_uuid'   => $this->order['uuid'],
-            'order_amount' => $this->order['amount_total'],
-        ]));
-        // 刷新用户返利统计
-        UserRebateService::instance()->amount($uuid);
-    }
 
     /**
      * 用户复购奖励
@@ -437,4 +392,50 @@ class RebateService extends Service
         $puids = DataUser::mk()->whereIn('id', $uuids)->orderField('id', $uuids)->where($map)->column('id');
         if (count($puids) < 2) return false;
     }
+
+    /**
+     * 获取奖励名称
+     * @param string $prize
+     * @return string
+     */
+    public function name(string $prize): string
+    {
+        return self::PRIZES[$prize]['name'] ?? $prize;
+    }
+
+    /**
+     * 检查等级是否有奖励
+     * @param string $prize 奖励规则
+     * @param integer $level 用户等级
+     * @return boolean
+     */
+    private function checkPrizeStatus(string $prize, int $level): bool
+    {
+        $query = BaseUserUpgrade::mk()->where(['number' => $level]);
+        return $query->whereLike('rebate_rule', "%,{$prize},%")->count() > 0;
+    }
+
+    /**
+     * 写返利记录
+     * @param int $uuid
+     * @param array $map
+     * @param string $name
+     * @param float $amount
+     */
+    private function writeRabate(int $uuid, array $map, string $name, float $amount)
+    {
+        DataUserRebate::mk()->insert(array_merge($map, [
+            'uuid'         => $uuid,
+            'date'         => date('Y-m-d'),
+            'code'         => CodeExtend::uniqidDate(20, 'R'),
+            'name'         => $name,
+            'amount'       => $amount,
+            'status'       => $this->status,
+            'order_no'     => $this->order['order_no'],
+            'order_uuid'   => $this->order['uuid'],
+            'order_amount' => $this->order['amount_total'],
+        ]));
+        // 刷新用户返利统计
+        UserRebateService::instance()->amount($uuid);
+    }
 }
\ No newline at end of file