From 2b30804879b204db142999fa56710d5f593efd66 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 08 Jan 2024 10:52:57 +0800
Subject: [PATCH] 团队列表
---
src/main/java/cc/mrbird/febs/mall/dto/AdminAgentAmountDto.java | 1
src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java | 7 +++
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java | 3 +
src/main/java/cc/mrbird/febs/mall/entity/MallMember.java | 2 +
src/main/resources/templates/febs/views/modules/system/agentAmountSet.html | 65 +++++++++++++++++++-------------
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 20 +++++++++
src/main/java/cc/mrbird/febs/common/utils/AppContants.java | 3 +
src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java | 7 +++
src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java | 2 +
src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java | 1
10 files changed, 83 insertions(+), 28 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java b/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
index a13dc86..67baa4f 100644
--- a/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
+++ b/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
@@ -5,6 +5,8 @@
@Getter
public enum DataDictionaryEnum {
+ // 成为会员的最低累计消费
+ MIN_AMOUNT_IS_MEMBER("MIN_AMOUNT_IS_MEMBER", "MIN_AMOUNT_IS_MEMBER"),
// 拿下一级（直推的）收入的百分之五十
MEMBER_RETURN_PERCENT_UP("MEMBER_RETURN_PERCENT_UP", "MEMBER_RETURN_PERCENT_UP"),
// 上级返佣金比例，返回到余额
diff --git a/src/main/java/cc/mrbird/febs/common/utils/AppContants.java b/src/main/java/cc/mrbird/febs/common/utils/AppContants.java
index 43d6356..b9ce3ab 100644
--- a/src/main/java/cc/mrbird/febs/common/utils/AppContants.java
+++ b/src/main/java/cc/mrbird/febs/common/utils/AppContants.java
@@ -63,6 +63,9 @@
public static final int DEL_FLAG_Y = 1;
+ public static final int MEMBER_STATE_YES = 1;//会员表示 1：会员 0：非会员
+ public static final int MEMBER_STATE_NO = 0;//会员表示 1：会员 0：非会员
+
public static final int DEL_FLAG_N = 2;
public static final String REDIS_ORDER_OVERTIME_PREFIX = "order_overtime_";
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 ba2bc2b..64e7d6a 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
@@ -118,6 +118,13 @@
chargeAmountDic.setValue(adminAgentAmountDto.getChargeAmount());
dataDictionaryCustomMapper.updateById(chargeAmountDic);
+
+ DataDictionaryCustom minAmountDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.MIN_AMOUNT_IS_MEMBER.getType(),
+ DataDictionaryEnum.MIN_AMOUNT_IS_MEMBER.getCode());
+ minAmountDic.setValue(adminAgentAmountDto.getMinAmount());
+ dataDictionaryCustomMapper.updateById(minAmountDic);
+
return new FebsResponse().success().message("操作成功");
}
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
index 0e946b7..6d8f655 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
@@ -70,6 +70,13 @@
if (chargeAmountDic != null) {
adminAgentAmountDto.setChargeAmount(chargeAmountDic.getValue());
}
+ DataDictionaryCustom minAmountDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.MIN_AMOUNT_IS_MEMBER.getType(),
+ DataDictionaryEnum.MIN_AMOUNT_IS_MEMBER.getCode());
+
+ if (minAmountDic != null) {
+ adminAgentAmountDto.setMinAmount(minAmountDic.getValue());
+ }
model.addAttribute("agentAmountSet", adminAgentAmountDto);
return FebsUtil.view("modules/system/agentAmountSet");
}
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/AdminAgentAmountDto.java b/src/main/java/cc/mrbird/febs/mall/dto/AdminAgentAmountDto.java
index d837df2..a67772c 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/AdminAgentAmountDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/AdminAgentAmountDto.java
@@ -13,4 +13,5 @@
private String activityBulletin;
private String giveAmount;
private String chargeAmount;
+ private String minAmount;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
index b78d9b6..490e308 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
@@ -161,4 +161,6 @@
@TableField(exist = false)
private String salesmansName;
+ private Integer isMember;//是否是会员 0：非会员 1：正式会员（可以查看普通商品，可以查看邀请码）
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java b/src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java
index ee10ae5..c17b309 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java
@@ -89,4 +89,5 @@
FebsResponse findMallMemberClassInPage(ApiMemberClassDto queryDto);
FebsResponse findMallMemberHouseInPage(ApiMemberHouseDto queryDto);
+
}
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 1db5c81..361081e 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
@@ -351,7 +351,25 @@
}
Long memberId = mallOrderInfo.getMemberId();
MallMember mallMember = memberMapper.selectById(memberId);
-
+ /**
+ * 用户是否满足最低消费，满足则升级成为会员，可以邀请用户，并且查看会员商城
+ */
+ Integer isMember = mallMember.getIsMember();
+ if(AppContants.MEMBER_STATE_NO == isMember){
+ List<MallOrderInfo> mallOrderInfos = mallOrderInfoMapper.selectOrderInfoByStatus(OrderStatusEnum.FINISH.getValue());
+ if(CollUtil.isNotEmpty(mallOrderInfos)){
+ DataDictionaryCustom minAmountDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.MIN_AMOUNT_IS_MEMBER.getType(),
+ DataDictionaryEnum.MIN_AMOUNT_IS_MEMBER.getCode()
+ );
+ BigDecimal minAmount = new BigDecimal(minAmountDic.getValue());//系统设置的累计消费金额
+ BigDecimal accumulateAmount = mallOrderInfos.stream().map(MallOrderInfo::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);//累计消费金额
+ if(minAmount.compareTo(accumulateAmount) <= 0){//用户累计消费大于系统设置的累计消费
+ mallMember.setIsMember(AppContants.MEMBER_STATE_YES);
+ memberMapper.updateById(mallMember);
+ }
+ }
+ }
List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(mallOrderInfo.getId());
if(CollUtil.isEmpty(mallOrderItemList)){
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
index 9808150..b24b38f 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -87,4 +87,7 @@
@ApiModelProperty(value = "积分兑换比例 1，则一积分等于一元 2则2积分等于壹元")
private String scoreChange;
+ @ApiModelProperty(value = "是否是会员 0：非会员 1：正式会员（可以查看普通商品，可以查看邀请码）")
+ private Integer isMember;
+
}
diff --git a/src/main/resources/templates/febs/views/modules/system/agentAmountSet.html b/src/main/resources/templates/febs/views/modules/system/agentAmountSet.html
index 6aefe20..be21109 100644
--- a/src/main/resources/templates/febs/views/modules/system/agentAmountSet.html
+++ b/src/main/resources/templates/febs/views/modules/system/agentAmountSet.html
@@ -1,4 +1,4 @@
-<div class="layui-fluid layui-anim febs-anim" id="agent-amount-set" lay-title="充值设置">
+<div class="layui-fluid layui-anim febs-anim" id="agent-amount-set" lay-title="设置">
<div class="layui-row layui-col-space8 febs-container">
<form class="layui-form" action="" lay-filter="agent-amount-set-form">
<div class="layui-card">
@@ -13,38 +13,48 @@
<!-- <div class="layui-word-aux" style="margin-left: 150px;">申请成为合伙人需要充值的金额数目</div>-->
<!-- </div>-->
- <div class="layui-form-item">
- <blockquote class="layui-elem-quote blue-border">普通充值赠送金额设置</blockquote>
- <label class="layui-form-label">充值送金额：</label>
- <div class="layui-input-block">
- <input type="radio" name="giveState" value="1" title="开启" lay-filter="giveStateOpen" />
- <input type="radio" name="giveState" value="2" title="关闭" lay-filter="giveStateOpen" checked/>
- </div>
- </div>
- <div class="layui-form-item activityBulletin-input febs-hide">
- <label class="layui-form-label">活动公告：</label>
- <div class="layui-input-block">
- <input id="activityBulletin" type="text" name="activityBulletin" placeholder="" autocomplete="off" class="layui-input">
- <div class="layui-form-mid layui-word-aux">活动公告为一句话，在首页滚动。</div>
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <blockquote class="layui-elem-quote blue-border">普通充值赠送金额设置</blockquote>-->
+<!-- <label class="layui-form-label">充值送金额：</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="radio" name="giveState" value="1" title="开启" lay-filter="giveStateOpen" />-->
+<!-- <input type="radio" name="giveState" value="2" title="关闭" lay-filter="giveStateOpen" checked/>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item activityBulletin-input febs-hide">-->
+<!-- <label class="layui-form-label">活动公告：</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input id="activityBulletin" type="text" name="activityBulletin" placeholder="" autocomplete="off" class="layui-input">-->
+<!-- <div class="layui-form-mid layui-word-aux">活动公告为一句话，在首页滚动。</div>-->
+<!-- </div>-->
+<!-- </div>-->
- <div class="layui-form-item chargeAmount-input febs-hide">
- <label class="layui-form-label ">充值金额：</label>
- <div class="layui-input-block">
- <input id="chargeAmount" type="text" name="chargeAmount"
- lay-verify="" autocomplete="off" class="layui-input" >
- </div>
- <div class="layui-word-aux" style="margin-left: 150px;">普通充值的金额大于等于设置的【充值金额】，则额外赠送系统设置的【赠送金额】</div>
- </div>
+<!-- <div class="layui-form-item chargeAmount-input febs-hide">-->
+<!-- <label class="layui-form-label ">充值金额：</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input id="chargeAmount" type="text" name="chargeAmount"-->
+<!-- lay-verify="" autocomplete="off" class="layui-input" >-->
+<!-- </div>-->
+<!-- <div class="layui-word-aux" style="margin-left: 150px;">普通充值的金额大于等于设置的【充值金额】，则额外赠送系统设置的【赠送金额】</div>-->
+<!-- </div>-->
+
+<!-- <div class="layui-form-item giveAmount-input febs-hide">-->
+<!-- <label class="layui-form-label ">赠送金额：</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input id="giveAmount" type="text" name="giveAmount"-->
+<!-- lay-verify="" autocomplete="off" class="layui-input" >-->
+<!-- </div>-->
+<!-- <div class="layui-word-aux" style="margin-left: 150px;">普通充值额外赠送的金额</div>-->
+<!-- </div>-->
<div class="layui-form-item giveAmount-input febs-hide">
- <label class="layui-form-label ">赠送金额：</label>
+ <blockquote class="layui-elem-quote blue-border">金额设置</blockquote>
+ <label class="layui-form-label ">最低消费：</label>
<div class="layui-input-block">
- <input id="giveAmount" type="text" name="giveAmount"
+ <input id="minAmount" type="text" name="minAmount"
lay-verify="" autocomplete="off" class="layui-input" >
</div>
- <div class="layui-word-aux" style="margin-left: 150px;">普通充值额外赠送的金额</div>
+ <div class="layui-word-aux" style="margin-left: 150px;">成为会员的最低累计消费</div>
</div>
</div>
@@ -90,6 +100,7 @@
"activityBulletin": agentAmountSet.activityBulletin,
"giveAmount": agentAmountSet.giveAmount,
"chargeAmount": agentAmountSet.chargeAmount,
+ "minAmount": agentAmountSet.minAmount,
});
if (agentAmountSet.giveState == 1) {
--
Gitblit v1.9.1