From 92cff3187da0fa43f2aaf0d8a71ce0653fcb2574 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 26 一月 2024 10:58:26 +0800
Subject: [PATCH] 修改数据权限bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 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 01b334d..bb77b82 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
@@ -18,8 +18,6 @@
import javax.annotation.Resource;
import java.util.List;
-import static org.reflections.Reflections.log;
-
/**
* @author jqs34
* @ClassName MerOrderController
@@ -64,6 +62,16 @@
throw new ServiceException(AppErrorConstant.VERIFY_TYPE_MISS);
}
return R.ok(merVerifyCodeVo);
+ }
+
+ @RequestMapping(value = "/verifyOrder", method = RequestMethod.POST)
+ @ApiOperation(value = "核销code")
+ public R<MerVerifyOrderVo> verifyOrder(@RequestBody MerVerifyCodeDto merVerifyCodeDto) {
+ Long userId = SecurityUtils.getUserId();
+ merVerifyCodeDto.setUserId(userId);
+ String verifyCode = merVerifyCodeDto.getVerifyCode();
+ MerVerifyOrderVo merVerifyOrderVo = orderService.verifyOrder(verifyCode,merVerifyCodeDto.getShopId());
+ return R.ok(merVerifyOrderVo);
}
@RequestMapping(value = "/sureVerifyOrder", method = RequestMethod.POST)
@@ -148,16 +156,26 @@
@RequestMapping(value = "/pageMerMemberOrder", method = RequestMethod.POST)
@ApiOperation(value = "分页商户端用户收银记录")
- public R<Page<MerMemberNoClearOrderVo>> pageMerMemberOrder(@RequestBody MerMemberNoClearOrderDto merMemberNoClearOrderDto) {
+ public R<Page<MerMemberOrderVo>> pageMerMemberOrder(@RequestBody MerMemberNoClearOrderDto merMemberNoClearOrderDto) {
Long userId = SecurityUtils.getUserId();
merMemberNoClearOrderDto.setUserId(userId);
- Page<MerMemberNoClearOrderVo> page = new Page<>();
+ Page<MerMemberOrderVo> page = new Page<>();
page.setSize(merMemberNoClearOrderDto.getPageSize());
page.setCurrent(merMemberNoClearOrderDto.getPageNum());
- log.info("merMemberNoClearOrderDto----"+merMemberNoClearOrderDto.toString());
- List<MerMemberNoClearOrderVo> merMemberNoClearOrderVoList = orderService.pageMerMemberOrder(page,merMemberNoClearOrderDto);
+ List<MerMemberOrderVo> merMemberNoClearOrderVoList = orderService.pageMerMemberOrder(page,merMemberNoClearOrderDto);
return R.ok(page.setRecords(merMemberNoClearOrderVoList));
}
+ @RequestMapping(value = "/pageMerMemberPayOrder", method = RequestMethod.POST)
+ @ApiOperation(value = "获取商户端用户消费记录")
+ public R<Page<MerOrderPageVo>> pageMerMemberPayOrder(@RequestBody MerMemberNoClearOrderDto merOrderPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ merOrderPageDto.setUserId(userId);
+ Page<MerOrderPageVo> page = new Page<>();
+ page.setSize(merOrderPageDto.getPageSize());
+ page.setCurrent(merOrderPageDto.getPageNum());
+ List<MerOrderPageVo> merOrderPageVoList = orderService.pageMerMemberPayOrder(page,merOrderPageDto);
+ return R.ok(page.setRecords(merOrderPageVoList));
+ }
}
--
Gitblit v1.7.1