From 06f455915bb9d11caa8829942f9007809ee9ae3d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 28 十一月 2024 16:37:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java |   74 +++++++++++++++++++++++++++++++++++++
 1 files changed, 74 insertions(+), 0 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
new file mode 100644
index 0000000..aeaa5dc
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java
@@ -0,0 +1,74 @@
+package com.ruoyi.order.controller;
+
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.order.service.ShoppingCartService;
+import com.ruoyi.order.vo.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import model.ShoppingCart;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/shopping-cart")
+@Api(tags = "购物车")
+public class ShoppingCartController extends BaseController {
+
+	@Resource
+	private ShoppingCartService shoppingCartService;
+
+	
+	@ResponseBody
+	@GetMapping("/getMyShoppingCart/{type}/{shopId}")
+	@ApiOperation(value = "获取购物车列表", tags = {"商城-购物车-小程序"})
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "type", value = "商品类型(1=服务商品,2=单品商品)", required = true, dataType = "int"),
+			@ApiImplicitParam(name = "shopId", value = "核销门店id", required = true, dataType = "int")
+	})
+	public TableDataInfo<MyShoppingCartVo> getMyShoppingCart(@PathVariable("type") Integer type, @PathVariable("shopId") Integer shopId){
+		startPage();
+		return getDataTable(shoppingCartService.getMyShoppingCart(type, shopId));
+	}
+
+	@PostMapping("/addGoods")
+	@ApiOperation(value = "添加购物车", tags = {"商城-购物车-小程序"})
+	public R<Void> addGoods(@RequestBody ShoppingCart shoppingCart) {
+		shoppingCartService.addGoods(shoppingCart);
+		return R.ok();
+	}
+	
+	
+	@ResponseBody
+	@PostMapping("/setGoodsNumber")
+	@ApiOperation(value = "修改购物车数量", tags = {"商城-购物车-小程序"})
+	public AjaxResult setGoodsNumber(@RequestBody SetGoodsNumber setGoodsNumber){
+		return shoppingCartService.setGoodsNumber(setGoodsNumber);
+	}
+	
+	
+	
+	@ResponseBody
+	@PostMapping("/confirmOrder")
+	@ApiOperation(value = "确定购物车订单", tags = {"商城-购物车-小程序"})
+	public AjaxResult<ConfirmOrderVo> confirmOrder(@RequestBody ConfirmOrder confirmOrder){
+		// todo 待完善 pu
+		return AjaxResult.success();
+	}
+	
+	
+	@ResponseBody
+	@PostMapping("/shoppingCartPayment")
+	@ApiOperation(value = "购物车订单支付", tags = {"商城-购物车-小程序"})
+	public AjaxResult<Void> shoppingCartPayment(@RequestBody ShoppingCartPayment shoppingCartPayment){
+		// todo 待完善 pu
+		return AjaxResult.success();
+	}
+	
+	
+}

--
Gitblit v1.7.1