From 8d738d847973e1184a704b5ca3d4f492bffdb03f Mon Sep 17 00:00:00 2001 From: rentaiming <806181062@qq.com> Date: 星期五, 26 七月 2024 09:01:37 +0800 Subject: [PATCH] 修改bug --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderController.java | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 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 9d71a16..90c168a 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,18 +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; /** @@ -26,10 +33,14 @@ @Slf4j @RestController @RequestMapping("/forepart/order") +@Api(value = "用户端-用户订单相关接口", tags = "用户端--用户订单相关接口", description = "用户端--用户订单相关接口") @RequiredArgsConstructor public class ForepartOrderController { private final IOrderService orderService; + + @Resource + private GoodsSkuClient goodsSkuClient; @PostMapping("/saveMemberOrder") @ApiOperation(value = "用户端-立即下单") @@ -41,6 +52,13 @@ @ApiOperation(value = "用户端-修改订单") 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(); } @@ -63,6 +81,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) { @@ -70,4 +95,11 @@ return R.ok(); } + + @PostMapping("/MemberOrderNum") + @ApiOperation(value = "用户端-订单的數量") + public R<MemberOrderNumVO> MemberOrderNum(@RequestBody MemberOrderListDTO memberOrderListDTO) { + return R.ok(orderService.MemberOrderNum(memberOrderListDTO)); + } + } -- Gitblit v1.7.1