From afa0dbb4f54e7244835dd67ec33c3e545f122f71 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 一月 2025 16:40:43 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java | 69 ++++++++++++++++++++++++++++------
1 files changed, 57 insertions(+), 12 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 ec29164..8f8a37c 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
@@ -36,7 +34,6 @@
private OrderService orderService;
-
@RequestMapping(value = "/verifyCode", method = RequestMethod.POST)
@ApiOperation(value = "核销code")
public R<MerVerifyCodeVo> verifyCode(@RequestBody MerVerifyCodeDto merVerifyCodeDto) {
@@ -50,21 +47,32 @@
merVerifyCodeVo.setVerifyType(type);
switch(type){
case 1:
- MerVerifyOrderVo merVerifyOrderVo = orderService.verifyOrder(verifyCode);
+ MerVerifyOrderVo merVerifyOrderVo = orderService.verifyOrder(verifyCode,merVerifyCodeDto.getShopId());
merVerifyCodeVo.setMerVerifyOrderVo(merVerifyOrderVo);
break;
case 2:
- MerVerifyCouponVo merVerifyCouponVo = null;
+ MerVerifyCouponVo merVerifyCouponVo = orderService.verifyCoupon(verifyCode,merVerifyCodeDto.getShopId());
+ merVerifyCouponVo.setCouponId(merVerifyCouponVo.getMemberCouponId().toString());
merVerifyCodeVo.setMerVerifyCouponVo(merVerifyCouponVo);
break;
case 3:
- MerVerifyAwardVo merVerifyAwardVo = null;
+ MerVerifyAwardVo merVerifyAwardVo = orderService.verifyPrize(verifyCode,merVerifyCodeDto.getShopId());
merVerifyCodeVo.setMerVerifyAwardVo(merVerifyAwardVo);
break;
default:
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)
@@ -74,6 +82,24 @@
merVerifyOrderDto.setUserId(userId);
MerVerifyOrderVo merVerifyOrderVo = orderService.sureVerifyOrder(merVerifyOrderDto);
return R.ok(merVerifyOrderVo);
+ }
+
+ @RequestMapping(value = "/sureVerifyCoupon", method = RequestMethod.POST)
+ @ApiOperation(value = "核销优惠券")
+ public R<MerVerifyCouponVo> sureVerifyCoupon(@RequestBody MerVerifyCouponDto merVerifyCouponDto) {
+ Long userId = SecurityUtils.getUserId();
+ merVerifyCouponDto.setUserId(userId);
+ MerVerifyCouponVo merVerifyCouponVo = orderService.sureVerifyCoupon(merVerifyCouponDto);
+ return R.ok(merVerifyCouponVo);
+ }
+
+ @RequestMapping(value = "/sureVerifyPrize", method = RequestMethod.POST)
+ @ApiOperation(value = "核销奖品")
+ public R<MerVerifyAwardVo> sureVerifyPrize(@RequestBody MerVerifyPrizeDto merVerifyPrizeDto) {
+ Long userId = SecurityUtils.getUserId();
+ merVerifyPrizeDto.setUserId(userId);
+ MerVerifyAwardVo merVerifyAwardVo = orderService.sureVerifyPrize(merVerifyPrizeDto);
+ return R.ok(merVerifyAwardVo);
}
@@ -111,27 +137,46 @@
@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 = "/totalMerOrder", method = RequestMethod.POST)
+ @ApiOperation(value = "商户端订单管理统计")
+ public R<MerTotalOrderVo> totalMerOrder(@RequestBody MerOrderPageDto merOrderPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ merOrderPageDto.setUserId(userId);
+ MerTotalOrderVo totalOrderVo = orderService.totalMerOrder(merOrderPageDto);
+ return R.ok(totalOrderVo);
+ }
+
@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