From ce0403c1d94ba031ecc832d0acfcb3650c33ef6b Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 二月 2025 17:02:23 +0800
Subject: [PATCH] 管理后台:会员管理、心愿求管理
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderController.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderController.java
index 210bb0c..9484a56 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderController.java
@@ -1,11 +1,11 @@
package com.ruoyi.order.controller.forepart;
-import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.service.IOrderService;
-import com.ruoyi.system.api.domain.Order;
+import com.ruoyi.order.vo.HomeGoodsSkuDTO1;
+import com.ruoyi.order.vo.WdOrderVO;
import com.ruoyi.system.api.domain.dto.MemberOrderDTO;
import com.ruoyi.system.api.domain.dto.MemberOrderListDTO;
import com.ruoyi.system.api.domain.vo.MemberOrderListVO;
@@ -15,11 +15,13 @@
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import javax.annotation.Resource;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
/**
@@ -43,15 +45,22 @@
private GoodsSkuClient goodsSkuClient;
@PostMapping("/saveMemberOrder")
- @ApiOperation(value = "用户端-立即下单")
+ @ApiOperation(value = "【09.25改】用户端-立即下单")
public R<MemberTiOrderVO> saveMemberOrder(@RequestBody MemberOrderDTO memberOrderDTO) {
return R.ok(orderService.saveMemberOrder(memberOrderDTO));
}
@PostMapping("/updMemberOrder")
- @ApiOperation(value = "用户端-修改订单")
+ @ApiOperation(value = "【09.25改】用户端-修改订单")
public R<MemberTiOrderVO> updMemberOrder(@RequestBody MemberOrderDTO memberOrderDTO) {
return R.ok(orderService.updMemberOrder(memberOrderDTO));
+ }
+
+ @PostMapping("/updMemberOrderbz")
+ @ApiOperation(value = "用户端-修改订单备注")
+ public R updMemberOrderbz(@RequestBody MemberOrderDTO memberOrderDTO) {
+ orderService.updMemberOrderbz(memberOrderDTO);
+ return R.ok();
}
@@ -95,4 +104,10 @@
return R.ok(orderService.MemberOrderNum(memberOrderListDTO));
}
+ @PostMapping("/CtjlGoodsGroupPurchase")
+ @ApiOperation(value = "用户端-我的参团记录")
+ public R<PageDTO<WdOrderVO>> CtjlGoodsGroupPurchase(@RequestBody HomeGoodsSkuDTO1 homeGoodsSkuDTO1) {
+ return R.ok(orderService.CtjlGoodsGroupPurchase(homeGoodsSkuDTO1));
+ }
+
}
--
Gitblit v1.7.1