fix
Helius
2024-04-10 e3639991ad290c83118919b41a610c8439909741
fix
5 files modified
54 ■■■■ changed files
src/main/java/cc/mrbird/febs/mall/entity/MallMember.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/vip/entity/MallVipBenefitsRecord.java 4 ●●●● patch | view | raw | blame | history
src/main/resources/mapper/modules/MallMemberMapper.xml 4 ●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html 7 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/mallMember/memberBenefitsList.html 34 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
@@ -173,6 +173,11 @@
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date birthday;
    @DateTimeFormat(pattern = "MM-dd")
    @JsonFormat(pattern = "MM-dd", timezone = "GMT+8")
    @TableField(exist = false)
    private Date birthdayQuery;
    private String realName;
    private Date lastLoginTime;
src/main/java/cc/mrbird/febs/vip/entity/MallVipBenefitsRecord.java
@@ -19,8 +19,8 @@
    @TableField(exist = false)
    private String memberPhone;
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @DateTimeFormat(pattern = "MM-dd")
    @JsonFormat(pattern = "MM-dd", timezone = "GMT+8")
    @TableField(exist = false)
    private Date birthday;
src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -11,8 +11,8 @@
        left join mall_vip_config vipConfig on m.level = vipConfig.code
        <where>
            <if test="record != null" >
                <if test="record.birthday!=null">
                    and m.birthday = #{record.birthday}
                <if test="record.birthdayQuery!=null">
                    and date_format(m.birthday, '%m-%d') = date_format(#{record.birthdayQuery}, '%m-%d')
                </if>
                <if test="record.name!=null and record.name!=''">
                    and m.name like concat('%',  #{record.name},'%')
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -33,7 +33,7 @@
                                        <label class="layui-form-label layui-form-label-sm">会员生日</label>
                                        <div class="layui-input-inline">
                                            <input type="text" name="birthday" id="febs-member-benefits-list-birthday-start" lay-verify="date"
                                                   placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
                                                   placeholder="MM-dd" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>
@@ -128,7 +128,8 @@
        form.render();
        laydate.render({
            elem: '#febs-member-benefits-list-birthday-start'
            elem: '#febs-member-benefits-list-birthday-start',
            format:'MM-dd'
        });
        // 表格初始化
@@ -477,7 +478,7 @@
                name: $searchForm.find('input[name="name"]').val().trim(),
                account: $searchForm.find('input[name="account"]').val().trim(),
                level: $searchForm.find("select[name='level']").val(),
                birthday: $searchForm.find("input[name='birthday']").val(),
                birthdayQuery: $searchForm.find("input[name='birthday']").val(),
                // level: $searchForm.find("select[name='level']").val(),
            };
        }
src/main/resources/templates/febs/views/modules/mallMember/memberBenefitsList.html
@@ -45,26 +45,9 @@
                                        <label class="layui-form-label layui-form-label-sm">会员生日</label>
                                        <div class="layui-input-inline">
                                            <input type="text" name="birthday" id="febs-member-benefits-list-birthday-start" lay-verify="date"
                                                   placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
                                                   placeholder="MM-dd" autocomplete="off" class="layui-input">
                                        </div>
<!--                                        <div class="layui-input-inline">-->
<!--                                            <input type="text" name="birthdayEnd" id="febs-member-benefits-list-birthday-end" lay-verify="date"-->
<!--                                                   placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">-->
<!--                                        </div>-->
                                    </div>
<!--                                    <div class="layui-inline">-->
<!--                                        <label class="layui-form-label layui-form-label-sm">领取时间</label>-->
<!--                                        <div class="layui-input-inline">-->
<!--                                            <input type="text" name="receiveStartTime" id="febs-member-benefits-list-start" lay-verify="date"-->
<!--                                                   placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">-->
<!--                                        </div>-->
<!--                                        <div class="layui-input-inline">-->
<!--                                            <input type="text" name="receiveEndTime" id="febs-member-benefits-list-end" lay-verify="date"-->
<!--                                                   placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">-->
<!--                                        </div>-->
<!--                                    </div>-->
                                </div>
                            </div>
                            <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -103,12 +86,11 @@
        laydate.render({
            elem: '#febs-member-benefits-list-birthday-start'
            ,value: new Date()
            ,format:'MM-dd'
        });
        form.render();
        // 表格初始化
        initTable();
        // 初始化表格操作栏各个按钮功能
        table.on('tool(memberBenefitsTable)', function (obj) {
@@ -137,17 +119,20 @@
            laydate.render({
                elem: '#febs-member-benefits-list-birthday-start'
                ,format:'MM-dd'
                ,value: new Date()
            });
            tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
        });
        function initTable() {
            var data = { birthday: formatDate(new Date()) }
            tableIns = febs.table.init({
                elem: $view.find('table'),
                id: 'memberBenefitsTable',
                url: ctx + 'admin/mallMember/findMemberBenefitsInPage',
                totalRow : true,
                where :data,
                cols: [[
                    {field: 'memberName', title: '会员名称', minWidth: 100,align:'left'},
                    {field: 'memberPhone', title: '手机号码', minWidth: 150,align:'left'},
@@ -209,5 +194,14 @@
            };
        }
        function formatDate(date) {
            const month = (date.getMonth() + 1).toString().padStart(2, '0');
            const day = date.getDate().toString().padStart(2, '0');
            return `${month}-${day}`;
        }
        // 表格初始化
        initTable();
    })
</script>