20220902

xiaoyong931011

2022-09-19 6b5123a406f250f3ae469dead435a206148017c1

20220902

 src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java

@@ -2,6 +2,7 @@


import cc.mrbird.febs.common.interceptor.LoginInterceptor;

import org.springframework.context.annotation.Configuration;

import org.springframework.web.servlet.config.annotation.CorsRegistry;

import org.springframework.web.servlet.config.annotation.InterceptorRegistration;

import org.springframework.web.servlet.config.annotation.InterceptorRegistry;

import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

@@ -28,4 +29,15 @@
        registration.excludePathPatterns("/api/unipay/agreeMentPayCallBack");

        registration.excludePathPatterns("/api/unipay/singlePayCallBack");

    }



    @Override

    public void addCorsMappings( CorsRegistry registry) {

        registry.addMapping("/**")//允许请求路径

                .allowedOrigins("*")//表示允许所有网址发起跨域请求

                .allowedMethods("POST", "GET", "PUT", "OPTIONS", "DELETE")//表示允许跨域请求的方法

                .maxAge(3600)//表示在3600秒内不需要再发送预校验请求

                .allowCredentials(true);//允许客户端携带验证信息，即允许携带cookie



    }



}


 src/main/java/cc/mrbird/febs/mall/controller/ApiApplyController.java

@@ -19,6 +19,7 @@
 **/
@Slf4j
@RestController
@CrossOrigin("*")
@RequestMapping(value = "/api/apply")
@RequiredArgsConstructor
@Api(value = "ApiApplyController", tags = "申请通道接口类")

 src/main/java/cc/mrbird/febs/mall/controller/ApiMallActController.java

@@ -16,6 +16,7 @@

@Slf4j
@RestController
@CrossOrigin("*")
@RequestMapping(value = "/api/act")
@RequiredArgsConstructor
@Api(value = "ApiApplyController", tags = "活动接口类")

 src/main/java/cc/mrbird/febs/mall/controller/ApiMallAddressInfoController.java

@@ -24,6 +24,7 @@
@Slf4j
@Validated
@RestController
@CrossOrigin("*")
@RequiredArgsConstructor
@RequestMapping(value = "/api/address")
@Api(value = "ApiMallAddressInfoController", tags = "用户地址管理接口类")

 src/main/java/cc/mrbird/febs/mall/controller/ApiMallGoodsCategoryController.java

@@ -9,10 +9,7 @@
import io.swagger.annotations.ApiResponses;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@@ -22,6 +19,7 @@
 **/
@Slf4j
@RestController
@CrossOrigin("*")
@RequiredArgsConstructor
@RequestMapping(value = "/api/category")
@Api(value = "ApiMallGoodsCategoryController", tags = "商品分类参数接收类")

 src/main/java/cc/mrbird/febs/mall/controller/ApiMallGoodsController.java

@@ -23,6 +23,7 @@
@Slf4j
@Validated
@RestController
@CrossOrigin("*")
@RequiredArgsConstructor
@RequestMapping(value = "/api/goods")
@Api(value = "ApiMallGoodsController", tags = "商城商品接口类")

 src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java

@@ -26,6 +26,7 @@
 **/
@Slf4j
@RestController
@CrossOrigin("*")
@RequestMapping(value = "/api/member")
@RequiredArgsConstructor
@Api(value = "ApiMallMemberController", tags = "商城用户接口类")

 src/main/java/cc/mrbird/febs/mall/controller/ApiMallNewsController.java

@@ -21,6 +21,7 @@
 **/
@Slf4j
@RestController
@CrossOrigin("*")
@RequestMapping(value = "/api/news")
@RequiredArgsConstructor
@Api(value = "ApiMallNewsController", tags = "新闻接口类")

 src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java

@@ -24,6 +24,7 @@
@Slf4j
@Validated
@RestController
@CrossOrigin("*")
@RequiredArgsConstructor
@RequestMapping(value = "/api/order")
@Api(value = "ApiMallOrderController", tags = "订单接口类")

 src/main/java/cc/mrbird/febs/mall/controller/ApiMallShoppingCartController.java

@@ -26,6 +26,7 @@
@Slf4j
@Validated
@RestController
@CrossOrigin("*")
@RequiredArgsConstructor
@RequestMapping(value = "/api/cart")
@Api(value = "ApiMallShoppingCartController", tags = "商城购物车接口请求类")

 src/main/java/cc/mrbird/febs/mall/dto/MallOrderInfoDto.java

@@ -24,4 +24,8 @@
    private String name;

    private Integer orderType;

    private String startTime;

    private String endTime;
}

 src/main/resources/mapper/modules/MallOrderInfoMapper.xml

@@ -67,6 +67,12 @@
                <if test="record.name != null and record.name != ''">
                    and b.name like CONCAT('%', CONCAT(#{record.name}, '%'))
                </if>
                <if test="record.startTime != null and record.startTime != ''">
                    and a.order_time &gt;= #{record.startTime}
                </if>
                <if test="record.endTime != null and record.endTime != ''">
                    and a.order_time &lt;= #{record.endTime}
                </if>
            </if>
        </where>
        order by a.created_time desc

 src/main/resources/templates/febs/views/modules/order/orderList.html

@@ -41,6 +41,20 @@
                                        </select>
                                    </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="startTime" id="febs-form-group-date-start" 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="endTime" id="febs-form-group-date-end" lay-verify="date"
                                               placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                            </div>

                            <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -89,7 +103,7 @@
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
    // 引入组件并初始化
    layui.use([ 'jquery', 'form', 'table', 'febs', 'upload'], function () {
    layui.use([ 'jquery', 'form', 'table', 'febs', 'upload','laydate'], function () {
        var $ = layui.jquery,
            febs = layui.febs,
            form = layui.form,
@@ -101,7 +115,17 @@
            $searchForm = $view.find('form'),
            $add = $view.find('#add'),
            sortObject = {field: 'phone', type: null},
            laydate = layui.laydate,
            tableIns;

        //日期范围
        laydate.render({
            elem: '#febs-form-group-date-start'
        });

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

        form.render();

@@ -264,7 +288,15 @@

        // 获取查询参数
        function getQueryParams() {
            let startTimestr = $searchForm.find('input[name="startTime"]').val().trim();
            let endTimeStr = $searchForm.find('input[name="endTime"]').val().trim();
            if(startTimestr != '' && endTimeStr != '' && startTimestr >= endTimeStr){
                febs.alert.warn('开始时间需要小于结束时间');
                return{};
            }
            return {
                startTime: $searchForm.find('input[name="startTime"]').val().trim(),
                endTime: $searchForm.find('input[name="endTime"]').val().trim(),
                name: $searchForm.find('input[name="name"]').val().trim(),
                orderNo: $searchForm.find('input[name="orderNo"]').val().trim(),
                payResult: $searchForm.find("select[name='payResult']").val(),