From 92da9546e1b37b06f78671b34389b1dec9dfadfc Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 06 六月 2023 13:57:42 +0800
Subject: [PATCH] 基础配置

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java |   73 ++++++++++++++++++++++++++++++++++--
 1 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
index 92f54b2..a7d4201 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
@@ -1,14 +1,15 @@
 package com.ruoyi.order.controller.business;
 
+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.AppSureOrderDto;
-import com.ruoyi.order.domain.dto.MerVerifyCodeDto;
-import com.ruoyi.order.domain.dto.MerVerifyOrderDto;
+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;
@@ -17,6 +18,10 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+import static org.reflections.Reflections.log;
 
 /**
  * @author jqs34
@@ -30,7 +35,7 @@
 @RequestMapping("/mer/order")
 public class MerOrderController {
 
-    @Autowired
+    @Resource
     private OrderService orderService;
 
 
@@ -39,6 +44,7 @@
     @ApiOperation(value = "核销code")
     public R<MerVerifyCodeVo> verifyCode(@RequestBody MerVerifyCodeDto merVerifyCodeDto) {
         Long userId = SecurityUtils.getUserId();
+        merVerifyCodeDto.setUserId(userId);
         String verifyCode = merVerifyCodeDto.getVerifyCode();
         String[] verifyCodeArr = verifyCode.split("-");
         MerVerifyCodeVo merVerifyCodeVo = new MerVerifyCodeVo();
@@ -68,8 +74,67 @@
     @ApiOperation(value = "核销订单")
     public R<MerVerifyOrderVo> sureVerifyOrder(@RequestBody MerVerifyOrderDto merVerifyOrderDto) {
         Long userId = SecurityUtils.getUserId();
+        merVerifyOrderDto.setUserId(userId);
         MerVerifyOrderVo merVerifyOrderVo = orderService.sureVerifyOrder(merVerifyOrderDto);
         return R.ok(merVerifyOrderVo);
     }
 
+
+    @RequestMapping(value = "/pageMerMemberNoClearOrder", method = RequestMethod.POST)
+    @ApiOperation(value = "分页获取用户未结清订单")
+    public R<Page<MerMemberNoClearOrderVo>> pageMerMemberNoClearOrder(@RequestBody MerMemberNoClearOrderDto merMemberNoClearOrderDto) {
+        Long userId = SecurityUtils.getUserId();
+        merMemberNoClearOrderDto.setUserId(userId);
+        Page<MerMemberNoClearOrderVo> page = new Page<>();
+        page.setSize(merMemberNoClearOrderDto.getPageSize());
+        page.setCurrent(merMemberNoClearOrderDto.getPageNum());
+        List<MerMemberNoClearOrderVo> merMemberNoClearOrderVoList = orderService.pageMerMemberNoClearOrder(page,merMemberNoClearOrderDto);
+        return R.ok(page.setRecords(merMemberNoClearOrderVoList));
+    }
+
+    @RequestMapping(value = "/merCloseOrder", method = RequestMethod.POST)
+    @ApiOperation(value = "结清订单")
+    public R merCloseOrder(@RequestBody MerCloseOrderDto merCloseOrderDto) {
+        Long userId = SecurityUtils.getUserId();
+        merCloseOrderDto.setUserId(userId);
+        orderService.merCloseOrder(merCloseOrderDto);
+        return R.ok();
+    }
+
+
+    @RequestMapping(value = "/createNewOrder", method = RequestMethod.POST)
+    @ApiOperation(value = "创建新订单")
+    public R createNewOrder(@RequestBody MerNewOrderDto merNewOrderDto) {
+        Long userId = SecurityUtils.getUserId();
+        merNewOrderDto.setUserId(userId);
+        orderService.createNewOrder(merNewOrderDto);
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/pageMerOrder", method = RequestMethod.POST)
+    @ApiOperation(value = "获取商户端订单列表")
+    public R<Page<MerOrderPageVo>> pageMerOrder(@RequestBody MerOrderPageDto merOrderPageDto) {
+        log.info("merOrderPageDto1----"+merOrderPageDto.toString());
+        Long userId = SecurityUtils.getUserId();
+        merOrderPageDto.setUserId(userId);
+        Page<MerOrderPageVo> page = new Page<>();
+        page.setSize(merOrderPageDto.getPageSize());
+        page.setCurrent(merOrderPageDto.getPageNum());
+        log.info("merOrderPageDto2----"+merOrderPageDto.toString());
+        List<MerOrderPageVo> merOrderPageVoList = orderService.pageMerOrder(page,merOrderPageDto);
+        return R.ok(page.setRecords(merOrderPageVoList));
+    }
+
+    @RequestMapping(value = "/pageMerMemberOrder", method = RequestMethod.POST)
+    @ApiOperation(value = "分页商户端用户收银记录")
+    public R<Page<MerMemberNoClearOrderVo>> pageMerMemberOrder(@RequestBody MerMemberNoClearOrderDto merMemberNoClearOrderDto) {
+        Long userId = SecurityUtils.getUserId();
+        merMemberNoClearOrderDto.setUserId(userId);
+        Page<MerMemberNoClearOrderVo> page = new Page<>();
+        page.setSize(merMemberNoClearOrderDto.getPageSize());
+        page.setCurrent(merMemberNoClearOrderDto.getPageNum());
+        log.info("merMemberNoClearOrderDto----"+merMemberNoClearOrderDto.toString());
+        List<MerMemberNoClearOrderVo> merMemberNoClearOrderVoList = orderService.pageMerMemberOrder(page,merMemberNoClearOrderDto);
+        return R.ok(page.setRecords(merMemberNoClearOrderVoList));
+    }
 }

--
Gitblit v1.7.1