海恒-鸿瑞堂
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
jiangqs
2023-06-26 b4882b114f082e010d4cc3359d78d18095ef3b83 
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java


@@ -3,22 +3,19 @@


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.ruoyi.common.core.domain.R;


import com.ruoyi.common.core.exception.ServiceException;


import com.ruoyi.common.security.annotation.InnerAuth;


import com.ruoyi.common.security.utils.SecurityUtils;


import com.ruoyi.order.domain.dto.*;


import com.ruoyi.order.domain.vo.*;


import com.ruoyi.order.service.order.OrderService;


import com.ruoyi.system.api.constant.AppErrorConstant;


import com.ruoyi.system.api.domain.dto.MerPageDto;


import com.ruoyi.system.api.domain.poji.member.Member;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiOperation;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.web.bind.annotation.RequestBody;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RequestMethod;


import org.springframework.web.bind.annotation.RestController;




import javax.annotation.Resource;


import java.util.List;




import static org.reflections.Reflections.log;


@@ -37,7 +34,6 @@




    @Resource


    private OrderService orderService;








    @RequestMapping(value = "/verifyCode", method = RequestMethod.POST)


@@ -137,4 +133,6 @@


        List<MerMemberNoClearOrderVo> merMemberNoClearOrderVoList = orderService.pageMerMemberOrder(page,merMemberNoClearOrderDto);


        return R.ok(page.setRecords(merMemberNoClearOrderVoList));


    }






}