From b669014e87140bf24f8f7a2de6bde63ff4105fc1 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 11 三月 2025 18:08:44 +0800
Subject: [PATCH] 拍卖结果弹窗消息
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderController.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 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 2eade8a..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
@@ -4,17 +4,24 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.order.service.IOrderService;
+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;
import com.ruoyi.system.api.domain.vo.MemberOrderNumVO;
import com.ruoyi.system.api.domain.vo.MemberTiOrderVO;
import com.ruoyi.system.api.domain.vo.OrderVO;
+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 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;
/**
@@ -34,16 +41,26 @@
private final IOrderService orderService;
+ @Resource
+ 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();
}
@@ -69,7 +86,7 @@
@PostMapping("/delOrderOne")
@ApiOperation(value = "用户端-删除订单")
public R delOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO) {
- orderService.removeById(memberOrderListDTO.getId());
+ orderService.delOrderOne(memberOrderListDTO);
return R.ok();
}
@@ -87,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