From 64a71565792d4f2e9fd31eab6e98e972c12daa86 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 27 十一月 2024 20:15:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 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..6132371 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
@@ -1,39 +1,44 @@
package com.ruoyi.order.controller;
+import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BaseTable;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.order.service.ShoppingCartService;
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;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+
@RestController
@RequestMapping("/shopping-cart")
@Api(tags = "购物车")
-public class ShoppingCartController {
+public class ShoppingCartController extends BaseController {
-
+ @Resource
+ private ShoppingCartService shoppingCartService;
@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")
})
- public AjaxResult<BaseTable<MyShoppingCartVo>> getMyShoppingCart(@PathVariable("type") Integer type, @PathVariable("shopId") Integer shopId){
- // todo 待完善 pu
- return AjaxResult.success();
+ public TableDataInfo<MyShoppingCartVo> getMyShoppingCart(@PathVariable("type") Integer type, @PathVariable("shopId") Integer shopId){
+ startPage();
+ return getDataTable(shoppingCartService.getMyShoppingCart(type, shopId));
}
@ResponseBody
@PostMapping("/setGoodsNumber")
- @ApiOperation(value = "修改购物车数量", tags = {"购物车-小程序"})
+ @ApiOperation(value = "修改购物车数量", tags = {"商城-购物车-小程序"})
public AjaxResult setGoodsNumber(@RequestBody SetGoodsNumber setGoodsNumber){
// todo 待完善 pu
return AjaxResult.success();
@@ -43,7 +48,7 @@
@ResponseBody
@PostMapping("/confirmOrder")
- @ApiOperation(value = "确定购物车订单", tags = {"购物车-小程序"})
+ @ApiOperation(value = "确定购物车订单", tags = {"商城-购物车-小程序"})
public AjaxResult<ConfirmOrderVo> confirmOrder(@RequestBody ConfirmOrder confirmOrder){
// todo 待完善 pu
return AjaxResult.success();
@@ -52,7 +57,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