From 547fcc825405ff66c5dda6670d00d1aed0760a27 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Wed, 22 Feb 2023 14:22:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0:=E7=94=A8=E6=88=B7=E8=BF=9D?=
 =?UTF-8?q?=E8=A7=84=E8=AE=BE=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addon/fenxiao/model/Config.php             |  3 +-
 addon/fenxiao/shop/controller/Config.php   |  2 +
 addon/fenxiao/shop/view/config/basics.html | 56 ++++++++++++++++------
 3 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/addon/fenxiao/model/Config.php b/addon/fenxiao/model/Config.php
index fc6db9a6..6c02c78e 100644
--- a/addon/fenxiao/model/Config.php
+++ b/addon/fenxiao/model/Config.php
@@ -49,7 +49,8 @@ class Config extends BaseModel
             'contribution_points_ratio'     => $data['contribution_points_ratio'],
             'settlement_points_to_balance_money_ratio'     => $data['settlement_points_to_balance_money_ratio'],
             'settlement_points_to_point_ratio'     => $data['settlement_points_to_point_ratio'],
-
+            'violation_unpaid'     => $data['violation_unpaid'],
+            'violation_hour'     => $data['violation_hour'],
         ];
         $config->setConfig($basics_data, '分销基本配置', $is_use, [['site_id', '=', $site_id], ['app_module', '=', 'shop'], ['config_key', '=', 'FENXIAO_BASICS_CONFIG']]);
         //分销商设置
diff --git a/addon/fenxiao/shop/controller/Config.php b/addon/fenxiao/shop/controller/Config.php
index 3c98acc5..86879b59 100644
--- a/addon/fenxiao/shop/controller/Config.php
+++ b/addon/fenxiao/shop/controller/Config.php
@@ -61,6 +61,8 @@ class Config extends BaseShop
                 'contribution_points_ratio' => input('contribution_points_ratio', 0),
                 'settlement_points_to_balance_money_ratio' => input('settlement_points_to_balance_money_ratio', 0),
                 'settlement_points_to_point_ratio' => input('settlement_points_to_point_ratio', 0),
+                'violation_unpaid' => (int)input('violation_unpaid', 0),
+                'violation_hour' => (int)input('violation_hour', 0),
             ];
 
             $res = $model->setFenxiaoBasicsConfig($data, 1, $this->site_id);
diff --git a/addon/fenxiao/shop/view/config/basics.html b/addon/fenxiao/shop/view/config/basics.html
index a7d50d31..5e7ab397 100644
--- a/addon/fenxiao/shop/view/config/basics.html
+++ b/addon/fenxiao/shop/view/config/basics.html
@@ -91,10 +91,41 @@
                 </div>
                 <div class="word-aux ">下单分享D位置得贡献值，得消费额百分比</div>
             </div>
-            <div class="layui-card-header">
-                <span class="card-title">每日转换设置</span>
+        </div>
+    </div>
+    <!-- 违规设置 -->
+    <div class="layui-card card-common card-brief">
+        <div class="layui-card-header">
+            <span class="card-title">违规设置</span>
+        </div>
+        <div class="layui-card-body">
+            <div class="layui-form-item">
+                <label class="layui-form-label">未支付次数：</label>
+                <div class="layui-input-block">
+                    <div class="layui-input-inline">
+                        <input type="number" name="violation_unpaid" class="layui-input ns-len-mid" value="{$basics_info.violation_unpaid ?? 0}" />
+                    </div>
+                </div>
+                <div class="word-aux ">用户在秒杀专区购买商品后，多少次为支付则进行违规惩罚！</div>
             </div>
-
+            <div class="layui-form-item">
+                <label class="layui-form-label">惩罚时间：</label>
+                <div class="layui-input-block">
+                    <div class="layui-input-inline">
+                        <input type="number" name="violation_hour" class="layui-input ns-len-mid" value="{$basics_info.violation_hour ?? 0}" />
+                    </div>
+                    <div class="layui-form-mid">小时</div>
+                </div>
+                <div class="word-aux ">惩罚时间内不能进入抢购专区</div>
+            </div>
+        </div>
+    </div>
+    <!-- 每日转换设置 -->
+    <div class="layui-card card-common card-brief">
+        <div class="layui-card-header">
+            <span class="card-title">每日转换设置</span>
+        </div>
+        <div class="layui-card-body">
             <div class="layui-form-item">
                 <label class="layui-form-label">无贡献值，积分每天定额返：</label>
                 <div class="layui-input-block">
@@ -105,7 +136,6 @@
                 </div>
                 <div class="word-aux ">无贡献值，积分每天定额返</div>
             </div>
-
             <div class="layui-form-item">
                 <label class="layui-form-label">有贡献值，积分每天定额返：</label>
                 <div class="layui-input-block">
@@ -116,7 +146,6 @@
                 </div>
                 <div class="word-aux ">有贡献值，积分每天定额返</div>
             </div>
-
             <div class="layui-form-item">
                 <label class="layui-form-label">定额返消费券占比：</label>
                 <div class="layui-input-block">
@@ -127,7 +156,6 @@
                 </div>
                 <div class="word-aux ">定额返消费券占比</div>
             </div>
-
             <div class="layui-form-item">
                 <label class="layui-form-label">定额返兑换券占比：</label>
                 <div class="layui-input-block">
@@ -138,7 +166,6 @@
                 </div>
                 <div class="word-aux ">定额返兑换券占比</div>
             </div>
-
             <div class="layui-form-item" style="display:none">
                 <label class="layui-form-label">是否开启分销：</label>
                 <div class="layui-input-block">
@@ -148,7 +175,6 @@
                     </div>
                 </div>
             </div>
-            
             <div class="layui-form-item distribution-index {if $basics_info.level == 0}layui-hide{/if}" style="display:none">
                 <label class="layui-form-label">分销层级：</label>
                 <div class="layui-input-block">
@@ -158,7 +184,6 @@
                     </div>
                 </div>
             </div>
-
             <div class="layui-form-item distribution-index {if $basics_info.level == 0}layui-hide{/if}" style="display:none">
                 <label class="layui-form-label">是否开启自购分佣：</label>
                 <div class="layui-input-block">
@@ -169,7 +194,6 @@
                 </div>
                 <div class="word-aux ">开启自购，分销商购买自身获得一级佣金<br/>关闭自购，分销商的上级分销商获得一级佣金，自身不再返佣</div>
             </div>
-
             <div class="layui-form-item distribution-index {if $basics_info.level == 0}layui-hide{/if}" style="display:none">
                 <label class="layui-form-label">是否展示商品详情一级佣金：</label>
                 <div class="layui-input-block">
@@ -181,9 +205,15 @@
                 <div class="word-aux ">开启后，商品详情显示，关闭后，商品详情不显示</div>
             </div>
         </div>
-    
     </div>
 
+
+
+
+
+
+
+
     <div class="layui-card card-common card-brief distribution-index {if $basics_info.level == 0}layui-hide{/if}" style="display:none">
         <div class="layui-card-header">
             <span class="card-title">上下线关系</span>
@@ -202,7 +232,6 @@
             </div>
         </div>
     </div>
-
     <div class="layui-card card-common card-brief distribution-index {if $basics_info.level == 0}layui-hide{/if}" style="display:none">
         <div class="layui-card-header">
             <span class="card-title">分销商资格</span>
@@ -290,7 +319,6 @@
             </div>
         </div>
     </div>
-
     <div class="layui-card card-common card-brief distribution-index {if $basics_info.level == 0}layui-hide{/if}" style="display:none">
         <div class="layui-card-header">
             <span class="card-title">默认分销佣金比率</span>
@@ -334,7 +362,6 @@
             </div>
         </div>
     </div>
-
     <!-- 操作 -->
     <script type="text/html" id="operation">
         <div class="table-btn">
@@ -348,7 +375,6 @@
             </div>
         </div>
     </div>
-
 </div>
 {/block}
 {block name="script"}