From c4637971bd5b0527b1e5d4e97dae97eb3071274f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Wed, 27 Jan 2021 18:18:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/service/PrizeService.php   | 39 ++++++++++++++++++-----------
 app/data/view/shop_goods/index.html | 11 ++++----
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/app/data/service/PrizeService.php b/app/data/service/PrizeService.php
index 1c5d19cce..7990e57d6 100644
--- a/app/data/service/PrizeService.php
+++ b/app/data/service/PrizeService.php
@@ -44,6 +44,12 @@ class PrizeService extends Service
      */
     protected $fromer;
 
+    /**
+     * 绑定数据表
+     * @var string
+     */
+    private $table = 'DataUserRebate';
+
     /**
      * 获取奖励名称
      * @param string $prize
@@ -97,11 +103,11 @@ class PrizeService extends Service
     {
         if (empty($this->fromer)) return false;
         $map = ['order_uid' => $this->user['id']];
-        if ($this->app->db->name('DataUserRebate')->where($map)->count() > 0) return false;
+        if ($this->app->db->name($this->table)->where($map)->count() > 0) return false;
         if (!$this->checkLevelPrize(self::PRIZE_01, $this->fromer['vip_number'])) return false;
         // 创建返利奖励记录
         $map = ['type' => self::PRIZE_01, 'order_no' => $this->order['order_no'], 'order_uid' => $this->order['uid']];
-        if ($this->app->db->name('DataUserRebate')->where($map)->count() < 1) {
+        if ($this->app->db->name($this->table)->where($map)->count() < 1) {
             if (sysconf('shop.fristType') == 1) {
                 $amount = sysconf('shop.fristValue') ?: '0.00';
                 $name = self::instance()->name(self::PRIZE_01) . "，每人 {$amount} 元";
@@ -109,7 +115,7 @@ class PrizeService extends Service
                 $amount = sysconf('shop.fristValue') * $this->order['amount_total'] / 100;
                 $name = self::instance()->name(self::PRIZE_01) . "，订单 " . sysconf('shop.fristValue') . '%';
             }
-            $this->app->db->name('DataUserRebate')->insert(array_merge($map, [
+            $this->app->db->name($this->table)->insert(array_merge($map, [
                 'uid' => $this->fromer['id'], 'name' => $name, 'amount' => $amount, 'order_amount' => $this->order['amount_total'],
             ]));
             // 更新会员奖利金额
@@ -129,11 +135,11 @@ class PrizeService extends Service
     {
         if (empty($this->fromer)) return false;
         $map = ['order_uid' => $this->user['id']];
-        if ($this->app->db->name('DataUserRebate')->where($map)->count() < 1) return false;
+        if ($this->app->db->name($this->table)->where($map)->count() < 1) return false;
         if (!$this->checkLevelPrize(self::PRIZE_02, $this->fromer['vip_number'])) return false;
         // 创建返利奖励记录
         $map = ['type' => self::PRIZE_02, 'order_no' => $this->order['order_no'], 'order_uid' => $this->order['uid']];
-        if ($this->app->db->name('DataUserRebate')->where($map)->count() < 1) {
+        if ($this->app->db->name($this->table)->where($map)->count() < 1) {
             if (sysconf('shop.repeatType') == 1) {
                 $amount = sysconf('shop.repeatValue') ?: '0.00';
                 $name = self::instance()->name(self::PRIZE_02) . "，每人 {$amount} 元";
@@ -141,7 +147,7 @@ class PrizeService extends Service
                 $amount = sysconf('shop.repeatValue') * $this->order['amount_total'] / 100;
                 $name = self::instance()->name(self::PRIZE_02) . "，订单 " . sysconf('shop.repeatValue') . '%';
             }
-            $this->app->db->name('DataUserRebate')->insert(array_merge($map, [
+            $this->app->db->name($this->table)->insert(array_merge($map, [
                 'uid' => $this->fromer['id'], 'name' => $name, 'amount' => $amount, 'order_amount' => $this->order['amount_total'],
             ]));
             // 更新会员奖利金额
@@ -163,10 +169,10 @@ class PrizeService extends Service
         if (!$this->checkLevelPrize(self::PRIZE_03, $this->fromer['vip_number'])) return false;
         // 创建返利奖励记录
         $map = ['type' => self::PRIZE_03, 'order_no' => $this->order['order_no'], 'order_uid' => $this->order['uid']];
-        if ($this->app->db->name('DataUserRebate')->where($map)->count() < 1) {
+        if ($this->app->db->name($this->table)->where($map)->count() < 1) {
             $amount = sysconf('shop.repeatValue') * $this->order['amount_total'] / 100;
             $name = self::instance()->name(self::PRIZE_03) . "，订单 " . sysconf('shop.repeatValue') . '%';
-            $this->app->db->name('DataUserRebate')->insert(array_merge($map, [
+            $this->app->db->name($this->table)->insert(array_merge($map, [
                 'uid' => $this->fromer['id'], 'name' => $name, 'amount' => $amount, 'order_amount' => $this->order['amount_total'],
             ]));
             // 更新会员奖利金额
@@ -189,10 +195,10 @@ class PrizeService extends Service
         if (empty($pm2)) return false;
         if (!$this->checkLevelPrize(self::PRIZE_04, $pm2['vip_number'])) return false;
         $map = ['type' => self::PRIZE_04, 'order_no' => $this->order['order_no'], 'order_uid' => $this->order['uid']];
-        if ($this->app->db->name('DataUserRebate')->where($map)->count() < 1) {
+        if ($this->app->db->name($this->table)->where($map)->count() < 1) {
             $amount = sysconf('shop.indirectValue') * $this->order['amount_total'] / 100;
             $name = self::instance()->name(self::PRIZE_04) . "，订单 " . sysconf('shop.indirectValue') . '%';
-            $this->app->db->name('DataUserRebate')->insert(array_merge($map, [
+            $this->app->db->name($this->table)->insert(array_merge($map, [
                 'uid' => $pm2['id'], 'name' => $name, 'amount' => $amount, 'order_amount' => $this->order['amount_total'],
             ]));
             // 更新代理奖利金额
@@ -226,12 +232,15 @@ class PrizeService extends Service
                 [$tVip, $tRate] = [$item['vip_number'], $item['discount_rate']];
                 foreach ($rules as $rule) if ($rule['level'] > $tVip) foreach ($users as $user) if ($user['vip_number'] > $tVip) {
                     if ($tRate > $rule['discount'] && $tRate < 100) {
-                        $map = ['type' => self::PRIZE_05, 'code' => "{$this->order['order_no']}#{$tVip}-{$user['vip_number']}"];
-                        if ($this->app->db->name('DataUserRebate')->where($map)->count() < 1) {
+                        $map = [
+                            'uid'  => $user['id'],
+                            'type' => self::PRIZE_05,
+                            'code' => "{$this->order['order_no']}#{$item['id']}#{$tVip}.{$user['vip_number']}",
+                        ];
+                        if ($this->app->db->name($this->table)->where($map)->count() < 1) {
                             $dRate = ($tRate - $rule['discount']) / 100;
-                            $this->app->db->name('DataUserRebate')->insert(array_merge($map, [
-                                'uid'          => $user['id'],
-                                'name'         => "等级差额奖励{$tVip}#{$user['vip_number']}商品金额{$dRate}%",
+                            $this->app->db->name($this->table)->insert(array_merge($map, [
+                                'name'         => "等级差额奖励{$tVip}#{$user['vip_number']}商品的{$dRate}%",
                                 'amount'       => $dRate * $item['total_selling'],
                                 'order_no'     => $this->order['order_no'],
                                 'order_uid'    => $this->order['uid'],
diff --git a/app/data/view/shop_goods/index.html b/app/data/view/shop_goods/index.html
index 226fc58be..16a2b1526 100644
--- a/app/data/view/shop_goods/index.html
+++ b/app/data/view/shop_goods/index.html
@@ -1,10 +1,6 @@
 {extend name="../../admin/view/main"}
 
 {block name="button"}
-<!--{if auth("shop_goods_mark/index")}-->
-<button data-iframe='{:url("shop_goods_mark/index")}' data-width="900px" data-title="标签管理" class='layui-btn layui-btn-sm layui-btn-primary'>标签管理</button>
-<!--{/if}-->
-
 <!--{if auth("add")}-->
 <button data-open='{:url("add")}' class='layui-btn layui-btn-sm layui-btn-primary'>添加商品</button>
 <!--{/if}-->
@@ -18,6 +14,10 @@
 <button data-action='{:url("remove")}' data-rule="code#{key};deleted#0" data-confirm="确定要恢复这些数据吗？" class='layui-btn layui-btn-sm layui-btn-primary'>恢复商品</button>
 <!--{/if}-->
 {/if}
+
+<!--{if auth("shop_goods_mark/index")}-->
+<button data-iframe='{:url("shop_goods_mark/index")}' data-width="900px" data-title="标签管理" class='layui-btn layui-btn-sm layui-btn-primary'>标签管理</button>
+<!--{/if}-->
 {/block}
 
 {block name="content"}
@@ -43,7 +43,7 @@
                     <button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button>
                 </th>
                 <th class='text-left nowrap'>商品信息</th>
-                <th class='text-left nowrap'>标签分类</th>
+                <th class='text-left nowrap'></th>
                 <th class='text-left nowrap'>商品状态</th>
                 <th></th>
             </tr>
@@ -85,6 +85,7 @@
                 </td>
                 <td class='nowrap sub-span-blue'>
                     <div class="margin-bottom-5">剩余库存 <span>{$vo.stock_total-$vo.stock_sales}</span> 件 ( 已销售 <span>{$vo.stock_sales}</span> 件 )</div>
+
                     <!--{if auth('copy')}-->
                     <a class="layui-btn layui-btn-xs layui-btn-normal" data-open='{:url("copy")}?code={$vo.code}'>复 制</a>
                     <!--{/if}-->