From 7532dd94bb63478fcd989c7501414a5806f8781e Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Tue, 19 Dec 2023 18:26:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=82=A1=E4=B8=9C=E5=88=86=E7=BA=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=8F=8A=E6=89=B9=E9=87=8F=E5=A4=84=E7=90=86=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shareholder-dividend/src/admin/SetController.php |  1 +
 .../views/admin/dividend-log.blade.php               | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/plugins/shareholder-dividend/src/admin/SetController.php b/plugins/shareholder-dividend/src/admin/SetController.php
index d370ea50..3c081f9d 100644
--- a/plugins/shareholder-dividend/src/admin/SetController.php
+++ b/plugins/shareholder-dividend/src/admin/SetController.php
@@ -27,6 +27,7 @@ class SetController extends BaseController
 
         // (new TimedTaskService())->shareholderDividendOrder(21);
         // 手动触发全网分红处理流程
+        // Setting::set('plugin.shareholder_log', []);
         // (new \Yunshop\ShareholderDividend\services\TimedTaskService)->handle();
 
 
diff --git a/plugins/shareholder-dividend/views/admin/dividend-log.blade.php b/plugins/shareholder-dividend/views/admin/dividend-log.blade.php
index 8f3d887f..97fae7d4 100644
--- a/plugins/shareholder-dividend/views/admin/dividend-log.blade.php
+++ b/plugins/shareholder-dividend/views/admin/dividend-log.blade.php
@@ -78,11 +78,13 @@
                 <th style='width:5%;'>ID</th>
                 <th style='width:10%;'>时间</th>
                 <th style='width:10%;'>会员</th>
-                <th style='width:8%;'>商城销售总额</th>
-                <th style='width:8%;'>等级分红比例</th>
-                <th style='width:8%;'>团队等级</th>
+                <th style='width:10%;'>商城销售总额</th>
+                <th style='width:5%;'>等级分红比例</th>
+                <th style='width:5%;'>团队等级</th>
                 <th style='width:10%;'>权重信息</th>
-                <th style='width:10%;'>返现金额</th>
+                <th style='width:5%;'>返现金额</th>
+                <th style='width:10%;'>结算类型</th>
+                <th style='width:10%;'>收益类型</th>
             </tr>
             </thead>
             <tbody>
@@ -108,6 +110,8 @@
                         占比：{{ $row['weight_value_rate'] . '%' }}<br />
                     </td>
                     <td>{{$row['amount']}}元</td>
+                    <td>{{$row['settlement_type'] == 1 ? '支付后结算' : '周期结算'}}</td>
+                    <td>{{$row['income_type'] == 1 ? '合伙人受益' : '权重分红'}}</td>
                 </tr>
             @endforeach
             </tbody>