From bd8eb594b0bd5c08a261c6930ddc2bd1736695ef Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 18 Apr 2023 11:48:50 +0800
Subject: [PATCH] 提现，限额
---
src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java | 5 +++++
src/main/resources/templates/febs/views/modules/system/hlmAchieveSet.html | 17 +++++++++++++++++
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 6 +++---
3 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
index c005101..a24183c 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
@@ -217,6 +217,11 @@
GreenScoreEnum.JOB_ACHIEVE_RELEASE_PERCENT.getCode(),
hlmVoucherButtonDto.getJobAchieveReleasePercent());
+ return new FebsResponse().success();
+ }
+
+ @PostMapping(value = "/hlmAchieveButton")
+ public FebsResponse hlmAchieveButton() {
agentService.achieveReleasePercent();
return new FebsResponse().success();
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
index 9190cce..2e1f3a1 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -599,9 +599,9 @@
.multiply(new BigDecimal(0.001));
//每个人的补贴额度
BigDecimal multiply = sumAchieve.multiply(jobAchieveReleasePercent);
- if(multiply.compareTo(new BigDecimal(50)) < 0){
- MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(mallMember.getId());
- BigDecimal totalScore = mallMemberWallet.getTotalScore();
+ MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(mallMember.getId());
+ BigDecimal totalScore = mallMemberWallet.getTotalScore();
+ if(BigDecimal.ZERO.compareTo(multiply) < 0){
if(BigDecimal.ZERO.compareTo(totalScore) < 0){
if(totalScore.compareTo(multiply) < 0){
multiply = totalScore;
diff --git a/src/main/resources/templates/febs/views/modules/system/hlmAchieveSet.html b/src/main/resources/templates/febs/views/modules/system/hlmAchieveSet.html
index 6af0adc..74f4a74 100644
--- a/src/main/resources/templates/febs/views/modules/system/hlmAchieveSet.html
+++ b/src/main/resources/templates/febs/views/modules/system/hlmAchieveSet.html
@@ -12,6 +12,9 @@
</div>
</div>
<div class="layui-card-footer">
+ <div class="layui-btn layui-btn-warm table-action" id="achieveButton">
+ 确认释放
+ </div>
<button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="hlm-achieve-set-submit" id="submit">保存</button>
</div>
</div>
@@ -38,6 +41,7 @@
febs = layui.febs,
form = layui.form,
hlmAchieveSet = [[${hlmAchieveSet}]],
+ $achieveButton = $view.find('#achieveButton'),
$view = $('#hlm-achieve-set');
form.verify({
@@ -49,6 +53,19 @@
initHlmAchieveSetValue();
+ $achieveButton.on('click', function () {
+ febs.modal.confirm('确认释放', '点击【确定】，释放？', function () {
+ achieveButtonRelease();
+ });
+ });
+
+ function achieveButtonRelease() {
+ febs.post(ctx + 'admin/system/hlmAchieveButton', null, function (res) {
+ febs.alert.success('操作成功');
+ return ;
+ });
+ }
+
form.render();
function initHlmAchieveSetValue() {
--
Gitblit v1.9.1