From aa8f41d3b4fcc7aae0bd50fdea92b126f22485df Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 05 五月 2023 18:34:54 +0800
Subject: [PATCH] 商户端主流程
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 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..53bff3f 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,8 @@
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;
/**
* @author jqs34
@@ -39,6 +42,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 +72,42 @@
@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();
+ }
+
+
}
--
Gitblit v1.7.1