From c31c0cc0bf9daee8b316d856cc136287ae8a442b Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 19 七月 2024 22:07:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderController.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 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 4533763..210bb0c 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,20 +1,25 @@
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.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 lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
/**
@@ -33,6 +38,9 @@
public class ForepartOrderController {
private final IOrderService orderService;
+
+ @Resource
+ private GoodsSkuClient goodsSkuClient;
@PostMapping("/saveMemberOrder")
@ApiOperation(value = "用户端-立即下单")
@@ -66,6 +74,13 @@
return R.ok();
}
+ @PostMapping("/delOrderOne")
+ @ApiOperation(value = "用户端-删除订单")
+ public R delOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO) {
+ orderService.delOrderOne(memberOrderListDTO);
+ return R.ok();
+ }
+
@PostMapping("/AffirmOrderOne")
@ApiOperation(value = "用户端-确认收货订单")
public R AffirmOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO) {
--
Gitblit v1.7.1