From de40c5a7d03ffe9bcdb2aabe82e03aef98e94eb8 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 03 四月 2025 18:07:41 +0800
Subject: [PATCH] 订单部分
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index 3354df0..37fddf0 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -70,6 +70,17 @@
private AppUserClient appUserClient;
+
+ @ResponseBody
+ @GetMapping("/confirmOrder")
+ @ApiOperation(value = "确定订单", tags = {"商城-订单-小程序"})
+ public R<ConfirmOrderVo> confirmOrder(@ApiParam("商品id") Integer goodId,@ApiParam("支付类型(1-现金，2-积分)")Integer type) {
+ ConfirmOrderVo confirmOrderVo = orderService.confirmOrder(goodId,type);
+ return R.ok(confirmOrderVo);
+ }
+
+
+
/**
* 我的订单列表
*/
@@ -188,17 +199,6 @@
return R.ok();
}
-
- /**
- * 预约技师
- */
- @PostMapping("/subscribe")
- public R<Void> subscribe(@RequestParam(value = "id", required = false) Long id, @RequestParam(value = "technicianId", required = false) Integer technicianId) {
- Order order = orderService.getById(id);
- order.setTechnicianId(technicianId);
- orderService.updateById(order);
- return R.ok();
- }
@PostMapping("/getLastOrder")
public R<Order> getLastOrder(@RequestParam("appUserId") Long appUserId) {
--
Gitblit v1.7.1