From 8c6be68405cc1a1108aff05d026bab12b7074948 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 25 十一月 2024 15:16:34 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java
index e6444db..d9e7874 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java
@@ -3,7 +3,6 @@
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BaseTable;
import com.ruoyi.order.vo.*;
-import com.ruoyi.other.vo.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -20,7 +19,7 @@
@ResponseBody
@GetMapping("/getMyShoppingCart/{type}/{shopId}")
- @ApiOperation(value = "获取购物车列表", tags = {"购物车-小程序"})
+ @ApiOperation(value = "获取购物车列表", tags = {"商城-购物车-小程序"})
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "商品类型（1=服务商品，2=单品商品）", required = true, dataType = "int"),
@ApiImplicitParam(name = "shopId", value = "核销门店id", required = true, dataType = "int")
@@ -33,7 +32,7 @@
@ResponseBody
@PostMapping("/setGoodsNumber")
- @ApiOperation(value = "修改购物车数量", tags = {"购物车-小程序"})
+ @ApiOperation(value = "修改购物车数量", tags = {"商城-购物车-小程序"})
public AjaxResult setGoodsNumber(@RequestBody SetGoodsNumber setGoodsNumber){
// todo 待完善 pu
return AjaxResult.success();
@@ -43,7 +42,7 @@
@ResponseBody
@PostMapping("/confirmOrder")
- @ApiOperation(value = "确定购物车订单", tags = {"购物车-小程序"})
+ @ApiOperation(value = "确定购物车订单", tags = {"商城-购物车-小程序"})
public AjaxResult<ConfirmOrderVo> confirmOrder(@RequestBody ConfirmOrder confirmOrder){
// todo 待完善 pu
return AjaxResult.success();
@@ -52,7 +51,7 @@
@ResponseBody
@PostMapping("/shoppingCartPayment")
- @ApiOperation(value = "购物车订单支付", tags = {"购物车-小程序"})
+ @ApiOperation(value = "购物车订单支付", tags = {"商城-购物车-小程序"})
public AjaxResult shoppingCartPayment(@RequestBody ShoppingCartPayment shoppingCartPayment){
// todo 待完善 pu
return AjaxResult.success();
--
Gitblit v1.7.1