From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java | 17 ++++++++++++++---
1 files changed, 14 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 13bd363..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
@@ -52,6 +52,7 @@
break;
case 2:
MerVerifyCouponVo merVerifyCouponVo = orderService.verifyCoupon(verifyCode,merVerifyCodeDto.getShopId());
+ merVerifyCouponVo.setCouponId(merVerifyCouponVo.getMemberCouponId().toString());
merVerifyCodeVo.setMerVerifyCouponVo(merVerifyCouponVo);
break;
case 3:
@@ -62,6 +63,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)
@@ -146,13 +157,13 @@
@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());
- List<MerMemberNoClearOrderVo> merMemberNoClearOrderVoList = orderService.pageMerMemberOrder(page,merMemberNoClearOrderDto);
+ List<MerMemberOrderVo> merMemberNoClearOrderVoList = orderService.pageMerMemberOrder(page,merMemberNoClearOrderDto);
return R.ok(page.setRecords(merMemberNoClearOrderVoList));
}
--
Gitblit v1.7.1