yujian
2021-05-29 083c8c1b0ba3dc48ac6639d4b839af5066751c0c
会员
5个文件已修改
100 ■■■■■ 已修改文件
app/src/main/java/com/ks/app/controller/admin/vip/VipCenterAdminController.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/resources/static/views/vip/grade-add.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/resources/static/views/vip/vipCenter-add.html 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/resources/static/views/vip/vipCenter-list.html 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
facade-vip/src/main/java/com/ks/vip/pojo/DO/VipCenter.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/ks/app/controller/admin/vip/VipCenterAdminController.java
@@ -55,9 +55,18 @@
                    VipCenterVO vipCenterVO = new VipCenterVO();
                    BeanUtils.copyProperties(vipCenter, vipCenterVO);
                    String str = "";
                    for (VipGrade vipGrade : listGrade) {
                        if (vipGrade.getId().longValue() == vipCenter.getGradeId().longValue()) {
                            vipCenterVO.setGradeName(vipGrade.getName());
                            str += "<option value=\"" + vipGrade.getId() + "\"  selected=\"selected\" > " + vipGrade.getName() + "</option> ";
                        } else {
                            str += "<option value=\"" + vipGrade.getId() + "\"> " + vipGrade.getName() + "</option> ";
                        }
                    }
                    // 下拉选择框
                    String vipGradeSelect = getVipGradeSelect(listGrade, vipCenter.getGradeId());
                    vipCenterVO.setVipGradeSelect(vipGradeSelect);
                    vipCenterVO.setVipGradeSelect(str);
                    // 用户名--查询 TODO
                    listVO.add(vipCenterVO);
@@ -79,11 +88,11 @@
    }
    public String getVipGradeSelect(List<VipGrade> listGrade, Long id) {
    public String getVipGradeSelect(List<VipGrade> listGrade, Long gradeId) {
        String str = "";
        for (VipGrade t : listGrade) {
            str += "<option value=\"" + t.getId() + "\" "
                    + (t.getId() == id.longValue() ? "selected=\"selected\"" : "") + " > " + t.getName()
                    + (t.getId().longValue() == gradeId.longValue() ? "selected=\"selected\"" : "") + " > " + t.getName()
                    + "</option> ";
        }
        System.out.println(str);
app/src/main/resources/static/views/vip/grade-add.html
@@ -40,7 +40,7 @@
                    等级标识</label>
                <div class="layui-input-inline">
                    <select id="identity" name="identity" class="layui-select">
                        <option value="silver">-请选择-</option>
                        <option value="">-请选择-</option>
                        <option value="silver">白银</option>
                        <option value="platinum">铂金</option>
                    </select>
app/src/main/resources/static/views/vip/vipCenter-add.html
@@ -24,49 +24,37 @@
<div class="layui-fluid">
    <div class="layui-row">
        <form class="layui-form">
            <div class="layui-form-item">
                <label for="state" class="layui-form-label">
                    状态</label>
                <label for="gradeId" class="layui-form-label">
                    所属等级</label>
                <div class="layui-input-inline">
                    <select id="state" name="state" class="layui-select">
                        <option value="1">启用</option>
                        <option value="0">停用</option>
                    <select id="gradeId" name="gradeId" class="layui-select">
                        <option value="0">请选择</option>
                    </select>
                </div>
            </div>
            <div class="layui-form-item">
                <label for="identity" class="layui-form-label">
                    等级标识</label>
                <label for="uid" class="layui-form-label">
                    <span class="x-red">*</span>用户ID</label>
                <div class="layui-input-inline">
                    <select id="identity" name="identity" class="layui-select">
                        <option value="silver">-请选择-</option>
                        <option value="silver">白银</option>
                        <option value="platinum">铂金</option>
                    </select>
                </div>
            </div>
            <div class="layui-form-item">
                <label for="name" class="layui-form-label">
                    <span class="x-red">*</span>等级名称</label>
                <div class="layui-input-inline">
                    <input type="text" id="name" name="name" required="" lay-verify="name" autocomplete="off"
                    <input type="text" id="uid" name="uid" required="" lay-verify="uid" autocomplete="off"
                           class="layui-input"></div>
            </div>
            <div class="layui-form-item">
                <label for="icon" class="layui-form-label">
                    <span class="x-red">*</span>等级图标</label>
                <label for="startTime" class="layui-form-label">
                    <span class="x-red">*</span>开始时间</label>
                <div class="layui-input-inline">
                    <input type="text" id="icon" name="icon" required="" lay-verify="icon"
                    <input type="text" id="startTime" name="startTime" required="" lay-verify="icon"
                           autocomplete="off" class="layui-input"></div>
            </div>
            <div class="layui-form-item">
                <label for="sort" class="layui-form-label">
                    等级序号</label>
                <label for="endTime" class="layui-form-label">
                    结束时间</label>
                <div class="layui-input-inline">
                    <input type="text" id="sort" name="sort" required="" lay-verify="sort"
                    <input type="text" id="endTime" name="endTime" required="" lay-verify="sort"
                           autocomplete="off" class="layui-input"></div>
            </div>
            <div class="layui-form-item">
@@ -106,6 +94,30 @@
        // });
        $.ajax({
            type:"GET",
            url:"/admin/api/vip/vipGrade/getValidList",
            dataType:"json",
            success:function(data){
                if(data.code == 0) {
                    $("#gradeId").empty();
                    $("#gradeId").append("<option selected value='0'>---请选择---</option>");
                    for(var i = 0; i < data.data.length; i++) {
                        $("#gradeId").append("<option value='" + data.data[i].id + "'>" + data.data[i].name + "</option>");
                    }
                    form.render();//注意渲染页面表单,否则不显示数据
                } else {
                    alert(data.msg);
                }
            },
            error:function(jqXHR){
                alert("请求失败!");
            }
        });
        //监听提交
        form.on('submit(add)',
            function (data) {
app/src/main/resources/static/views/vip/vipCenter-list.html
@@ -27,6 +27,7 @@
        .layui-table-cell {
            overflow: visible !important;
        }
        /* 使得下拉框与单元格刚好合适 */
        td .layui-form-select{
            margin-top: -10px;
@@ -102,9 +103,10 @@
<script type="text/html" id="gradeAction">
    <select name="editGrade" lay-filter="editGrade" id="editGrade"  data-value = {{d.gradeId}} >
        <option value="1">白银</option>
        <option value="2">铂金</option>
    <select name="editGrade" lay-filter="editGrade" id="editGrade"  data-value = {{d.gradeName}} >
       <!-- <option value="1">白银</option>
        <option value="2">铂金</option>-->
        {{d.vipGradeSelect}}
    </select>
</script>
<script>
@@ -210,9 +212,9 @@
            cols: [
                [{type: 'checkbox', title: "ID"},
                    {field: 'uid', width: 80, sort: true, title: "用户ID"},
                    {field: 'userName', edit: 'text', width: 150, title: "用户名称"},
                    {field: 'gradeId',  width: 150, title: "对应等级", templet:"#gradeAction"},
                    {field: 'startTime',edit: 'text', width: 120, sort: true, title: "开始时间" , templet:"#dateFomat1"},
                    {field: 'userName',  width: 150, title: "用户名称"},
                    {field: 'gradeName',  width: 200, title: "对应等级", templet:"#gradeAction"},
                    {field: 'startTime',edit: 'text', width: 150, sort: true, title: "开始时间" , templet:"#dateFomat1"},
                    {field: 'endTime', edit: 'text', width: 150, title: "结束时间" , templet:"#dateFomat2"},
                    {field: 'updateTime', sort: true, width: 150, title: "修改时间", templet:"#dateFomat"},
                    {fixed: 'right', width: 250, title: "操作", toolbar: '#barAction'},
facade-vip/src/main/java/com/ks/vip/pojo/DO/VipCenter.java
@@ -1,5 +1,6 @@
package com.ks.vip.pojo.DO;
import org.springframework.format.annotation.DateTimeFormat;
import org.yeshi.utils.generater.mybatis.Column;
import org.yeshi.utils.generater.mybatis.Table;
@@ -17,9 +18,11 @@
    @Column(name = "v_grade_id")
    private Long gradeId;
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @Column(name = "v_start_time")
    private Date startTime;
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @Column(name = "v_end_time")
    private Date endTime;