From d76a04800557a7c1456087e76a2f467e6f34e331 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Fri, 21 Apr 2023 15:36:43 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/common/enumerates/MemberLevelEnums.java | 10 +++++
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java | 12 +++++
src/main/java/cc/mrbird/febs/mall/entity/MallMember.java | 2
src/main/java/cc/mrbird/febs/mall/dto/RegisterDto.java | 2
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 80 ++++++----------------------------------
5 files changed, 35 insertions(+), 71 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/enumerates/MemberLevelEnums.java b/src/main/java/cc/mrbird/febs/common/enumerates/MemberLevelEnums.java
index 1354b76..7787495 100644
--- a/src/main/java/cc/mrbird/febs/common/enumerates/MemberLevelEnums.java
+++ b/src/main/java/cc/mrbird/febs/common/enumerates/MemberLevelEnums.java
@@ -26,4 +26,14 @@
this.code = code;
this.desc = desc;
}
+
+ public static String getDesc(int male, String code) {
+ for (MemberLevelEnums value : values()) {
+ if (value.male == male && value.code.equals(code)) {
+ return value.desc;
+ }
+ }
+
+ return null;
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/RegisterDto.java b/src/main/java/cc/mrbird/febs/mall/dto/RegisterDto.java
index f61d9eb..405f416 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/RegisterDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/RegisterDto.java
@@ -24,7 +24,7 @@
@NotBlank(message = "性别不能为空")
@ApiModelProperty(value = "性别", example = "1-男 2-女")
- private String sex;
+ private Integer sex;
@NotBlank(message = "密码不能为空")
@ApiModelProperty(value = "密码", example = "123456")
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 e6e2041..b0ae952 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
@@ -50,7 +50,7 @@
/**
* 性别
*/
- private String sex;
+ private Integer sex;
/**
* 邀请码
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 a5aa7c2..a0f4f34 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -1,5 +1,8 @@
package cc.mrbird.febs.mall.vo;
+import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
+import cc.mrbird.febs.common.enumerates.MemberLevelEnums;
+import cn.hutool.core.util.StrUtil;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -25,7 +28,7 @@
private String email;
@ApiModelProperty(value = "性别")
- private String sex;
+ private Integer sex;
@ApiModelProperty(value = "邀请码")
private String inviteId;
@@ -96,4 +99,11 @@
@ApiModelProperty(value = "内转标识 1：开启 2：关闭")
private Integer insideWith;
+ public String getLevelName() {
+ if (sex != null) {
+ return MemberLevelEnums.getDesc(sex, level);
+ }
+
+ return null;
+ }
}
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
index 6b99f98..aa22e72 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -29,21 +29,6 @@
</select>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">会员类型：</label>
- <div class="layui-input-inline">
- <select name="level">
- <option value="">请选择</option>
- <option value="ZERO_LEVEL">普通会员</option>
- <option value="SECOND_LEVEL">1星</option>
- <option value="THIRD_LEVEL">2星</option>
- <option value="FOUR_LEVEL">3星</option>
- <option value="FIFTH_LEVEL">4星</option>
- <option value="SIX_LEVEL">5星</option>
- <option value="SEVEN_LEVEL">6星</option>
- </select>
- </div>
- </div>
</div>
</div>
<div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -66,48 +51,17 @@
<!-- 表格操作栏 start -->
<script type="text/html" id="mallmember-option">
<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="moneyFlow:update" lay-event="moneyFlow">资金流水</button>
- <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="updateReferer:update" lay-event="updateReferer">修改推荐人</button>
+<!-- <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="updateReferer:update" lay-event="updateReferer">修改推荐人</button>-->
</script>
<script type="text/html" id="switchStatus">
- {{# if(d.accountStatus === 1) { }}
- <input type="checkbox" value={{d.id}} lay-text="正常|禁用" checked lay-skin="switch" lay-filter="switchStatus">
+ {{# if(d.accountStatus == 1) { }}
+ <span>会员</span>
+ {{# } else if(d.accountLevel == 2) { }}
+ <span>代理</span>
+ {{# } else if(d.accountLevel == 3) { }}
+ <span>股东</span>
{{# } else { }}
- <input type="checkbox" value={{d.id}} lay-text="正常|禁用" lay-skin="switch" lay-filter="switchStatus">
- {{# } }}
-</script>
-<script type="text/html" id="switchStoreMaster">
- {{# if(d.storeMaster === 1) { }}
- <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchStoreMaster">
- {{# } else { }}
- <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="switchStoreMaster">
- {{# } }}
-</script>
-<script type="text/html" id="switchDirector">
- {{# if(d.director === 1) { }}
- <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchDirector">
- {{# } else { }}
- <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="switchDirector">
- {{# } }}
-</script>
-<script type="text/html" id="switchCreate">
- {{# if(d.creater === 1) { }}
- <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchCreate">
- {{# } else { }}
- <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="switchCreate">
- {{# } }}
-</script>
-<script type="text/html" id="switchPartner">
- {{# if(d.partner === 1) { }}
- <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchPartner">
- {{# } else { }}
- <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="switchPartner">
- {{# } }}
-</script>
-<script type="text/html" id="switchInsideWith">
- {{# if(d.insideWith === 1) { }}
- <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchInsideWith">
- {{# } else { }}
- <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="switchInsideWith">
+ <span>未购买</span>
{{# } }}
</script>
<style>
@@ -119,12 +73,10 @@
<div class="layui-btn-container">
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="addMember:update" lay-event="registMember">添加会员</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="mallSystemPay:update" lay-event="balance">拨付余额</button>
-<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="mallSystemPay:update" lay-event="score">拨付赠送积分</button>-->
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="mallSystemPay:update" lay-event="score">拨付赠送积分</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="mallSystemPay:update" lay-event="prizeScore">拨付现金积分</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="resetPwd:update" lay-event="resetPwd">重置登录密码</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="resetPwd:update" lay-event="resetPayPwd">重置支付密码</button>
- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="agentLevelSet:update" lay-event="agentLevel">设置代理等级</button>
- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="voucherUpdate:update" lay-event="voucherUpdate">拨付绿色凭证</button>
</div>
</script>
<!-- 表格操作栏 end -->
@@ -268,22 +220,14 @@
totalRow: true ,// 开启合计行
cols: [[
{type: 'checkbox'},
- {field: 'phone', title: '账号', minWidth: 150,align:'left',hide:toolbarMallmember},
+ {field: 'phone', title: '账号', minWidth: 150,align:'left'},
{field: 'name', title: '名称', minWidth: 100,align:'left', totalRowText: '合计：'},
{field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
{field: 'balance', title: '余额', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.balance) }}'},
{field: 'prizeScore', title: '现金积分', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.prizeScore) }}'},
- {field: 'star', title: '贡献点', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.star) }}'},
- {field: 'totalScore', title: '补贴额度', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.totalScore) }}'},
- {field: 'voucherCnt', title: '绿色凭证', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.voucherCnt) }}'},
- {field: 'voucherAmount', title: '凭证现金', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.voucherAmount) }}'},
{field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
{field: 'levelName', title: '会员类型', minWidth: 100,align:'left'},
- {field: 'storeMaster', title: '线下服务中心', templet:'#switchStoreMaster', minWidth: 120,align:'left',hide:toolbarMallmember},
- {field: 'director', title: '代理商', templet:'#switchDirector', minWidth: 120,align:'left' ,hide:toolbarMallmember},
- {field: 'creater', title: '联创', templet:'#switchCreate', minWidth: 120,align:'left' ,hide:toolbarMallmember},
- {field: 'partner', title: '合伙人', templet:'#switchPartner', minWidth: 120,align:'left' ,hide:toolbarMallmember},
- {field: 'insideWith', title: '是否内转', templet:'#switchInsideWith', minWidth: 120,align:'left' ,hide:toolbarMallmember},
+ {field: 'insideWith', title: '账号级别', templet:'#switchStatus', minWidth: 120,align:'left'},
{field: 'accountType', title: '账号类型',
templet: function (d) {
if (d.accountType === 2) {
@@ -294,7 +238,7 @@
return ''
}
}, minWidth: 100,align:'left'},
- {field: 'accountStatus', title: '账号状态', templet: '#switchStatus', minWidth: 100,align:'left',hide:toolbarMallmember},
+ {field: 'accountStatus', title: '账号状态', templet: '#switchStatus', minWidth: 100,align:'left'},
{field: 'createdTime', title: '注册时间', minWidth: 180,align:'left'},
// {title: '操作',
// templet: function (d) {
--
Gitblit v1.9.1