From df864d1d636751424fd642d3bdd33c53cf63500d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 07 Jul 2025 17:51:09 +0800
Subject: [PATCH] feat(mall): 为活动订单项添加积分和成长值奖 - 在活动添加和编辑页面增加积分和成长值输入字段 - 更新活动实体类,添加 scoreCnt 和 growthCnt 字段 - 修改活动订单项处理逻辑,增加积分和成长值奖励的计算和发放 - 优化活动订单项状态检查逻辑,移除冗余代码

---
 src/main/resources/templates/febs/views/modules/system/profitSetting.html |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/system/profitSetting.html b/src/main/resources/templates/febs/views/modules/system/profitSetting.html
index efae5f9..34c54c2 100644
--- a/src/main/resources/templates/febs/views/modules/system/profitSetting.html
+++ b/src/main/resources/templates/febs/views/modules/system/profitSetting.html
@@ -52,11 +52,6 @@
         margin-bottom: 20px !important;
     }
 </style>
-<script type="text/html" id="toolbar">
-    <div class="layui-btn-container">
-        <button class="layui-btn layui-btn-danger layui-btn-sm" type="button" lay-event="delSku">删除</button>
-    </div>
-</script>
 <script type="text/html" id="bonusSystem">
     {{#  layui.each(d, function(index, item){ }}
     <div class="layui-form-item">
@@ -69,7 +64,7 @@
         {{# }}}
 
         {{# if(item.code == 'THANKFUL_BONUS') { }}
-        <div class="layui-word-aux" style="margin-left: 150px;">将推荐人收益(代理,直推,排名)的对应比例加权平分给下面直推</div>
+        <div class="layui-word-aux" style="margin-left: 150px;">将推荐人的收益(代理,直推,排名)的对应比例加权平分给下面直推</div>
         {{# }}}
     </div>
     {{# }) }}
@@ -99,6 +94,7 @@
                 ,{field: 'prop', title: '返利比例(%)', edit:'text'}
                 ,{field: 'achieve', title: '团队业绩(万元)', edit:'text'}
                 ,{field: 'direct', title: '直推(个)', edit:'text'}
+                ,{field: 'lastAgentCnt', title: '上一级代理(个)', edit:'text'}
                 ,{field: 'type', title: '比例', edit:'text', hide:'true'}
                 ,{field: 'code', title: '比例', edit:'text', hide:'true'}
             ]]
@@ -115,6 +111,7 @@
                     valueData.teamIncome = data.achieve;
                     valueData.profitProp = data.prop;
                     valueData.directCnt = data.direct;
+                    valueData.lastAgentCnt = data.lastAgentCnt;
                     agentBonusArr[i].value = JSON.stringify(valueData);
                 }
             }
@@ -189,6 +186,7 @@
                             data[i].prop = JSON.parse(data[i].value).profitProp;
                             data[i].achieve = JSON.parse(data[i].value).teamIncome;
                             data[i].direct = JSON.parse(data[i].value).directCnt;
+                            data[i].lastAgentCnt = JSON.parse(data[i].value).lastAgentCnt;
                         }
                         agentBonusArr = data;
                         table.reload('agentBonus', {

--
Gitblit v1.9.1