From 535c81a311bcd54b7ef5aa3f02b3cddc19b854d1 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 15 May 2025 16:06:14 +0800
Subject: [PATCH] feat(mall): 新增订单项的积分金额和积分价格字段- 在 MallOrderInfoMapper.xml 中添加了 item_score_amount 和 item_score_price 字段的映射 - 在 MallOrderItem 实体类中添加了 itemScorePrice 字段 - 更新了 selectNewApiOrderListInPage 查询，加入了积分金额和积分价格的计算
---
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