Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz

Helius

2022-05-27 994bd426e2772bc26bccd430f0d4f2440a6dc021

Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz

 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallActServiceImpl.java

@@ -152,6 +152,15 @@
        if (ObjectUtil.isEmpty(mallActSet)) {
            return new FebsResponse().fail().message("活动不存在，请刷新当前页面");
        }
        Date date = new Date();
        int compareStart = DateUtil.compare(date, mallActSet.getActStartTime());
        if(compareStart < 0){
            return new FebsResponse().fail().message("活动还未开始");
        }
        int compareEnd = DateUtil.compare(date, mallActSet.getActEndTime());
        if(compareEnd > 0){
            return new FebsResponse().fail().message("活动已结束");
        }
        mallActSet.setActStatus(MallActSet.ACT_STATUS_ENABLE);
        this.baseMapper.updateById(mallActSet);
        return new FebsResponse().success();

 src/main/resources/templates/febs/views/modules/act/actAddNew.html

@@ -29,14 +29,14 @@
                                        <div class="layui-col-lg6">
                                            <label class="layui-form-label febs-form-item-require">开始时间：</label>
                                            <div class="layui-input-block">
                                                <input type="text" name="actStartTime" id="febs-form-group-date" lay-verify="date"
                                                <input type="text" name="actStartTime" id="febs-form-group-date-start" lay-verify="date"
                                                       placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
                                            </div>
                                        </div>
                                        <div class="layui-col-lg6">
                                            <label class="layui-form-label febs-form-item-require">结束时间：</label>
                                            <div class="layui-input-block">
                                                <input type="text" name="actEndTime" id="febs-form-group-date" lay-verify="date"
                                                <input type="text" name="actEndTime" id="febs-form-group-date-end" lay-verify="date"
                                                       placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
                                            </div>
                                        </div>
@@ -155,7 +155,11 @@
        form.render();

        laydate.render({
            elem: '#febs-form-group-date'
            elem: '#febs-form-group-date-start'
        });

        laydate.render({
            elem: '#febs-form-group-date-end'
        });

        formSelects.render();

 src/main/resources/templates/febs/views/modules/act/actUpdateNew.html

@@ -33,14 +33,14 @@
                                    <div class="layui-col-lg6">
                                        <label class="layui-form-label febs-form-item-require">开始时间：</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="actStartTime" id="febs-form-group-date" lay-verify="date"
                                            <input type="text" name="actStartTime" id="febs-form-group-date-start" lay-verify="date"
                                                   placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                    <div class="layui-col-lg6">
                                        <label class="layui-form-label febs-form-item-require">结束时间：</label>
                                        <div class="layui-input-block">
                                            <input type="text" name="actEndTime" id="febs-form-group-date" lay-verify="date"
                                            <input type="text" name="actEndTime" id="febs-form-group-date-end" lay-verify="date"
                                                   placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
@@ -160,8 +160,13 @@
            validate = layui.validate,
            element = layui.element;
        form.render();

        laydate.render({
            elem: '#febs-form-group-date'
            elem: '#febs-form-group-date-start'
        });

        laydate.render({
            elem: '#febs-form-group-date-end'
        });
        formSelects.render();