From 13bf32fd3427b2571f718596fa2dc7227a92f0c0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 10 十二月 2024 17:50:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java | 110 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 95 insertions(+), 15 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 d9e7874..32c95e5 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,21 +1,50 @@
package com.ruoyi.order.controller;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.BaseTable;
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.order.service.ShoppingCartService;
import com.ruoyi.order.vo.*;
+import com.ruoyi.other.api.domain.GoodsShop;
+import com.ruoyi.other.api.domain.Shop;
+import com.ruoyi.other.api.feignClient.GoodsShopClient;
+import com.ruoyi.other.api.feignClient.ShopClient;
+import com.ruoyi.other.api.vo.GetGoodsShopByGoodsIds;
+import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import com.ruoyi.order.model.ShoppingCart;
import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
@RestController
@RequestMapping("/shopping-cart")
@Api(tags = "购物车")
-public class ShoppingCartController {
+public class ShoppingCartController extends BaseController {
+
+ @Resource
+ private ShoppingCartService shoppingCartService;
+
+ @Resource
+ private TokenService tokenService;
+
+ @Resource
+ private GoodsShopClient goodsShopClient;
+ @Resource
+ private ShopClient shopClient;
+
@ResponseBody
@GetMapping("/getMyShoppingCart/{type}/{shopId}")
@@ -24,37 +53,88 @@
@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));
+ }
+
+ @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){
- // todo 待完善 pu
- return AjaxResult.success();
+ public R setGoodsNumber(@RequestBody SetGoodsNumber setGoodsNumber){
+ return shoppingCartService.setGoodsNumber(setGoodsNumber);
}
+
+
+
+ @ResponseBody
+ @DeleteMapping("/delShoppingCart")
+ @ApiOperation(value = "删除购物车", tags = {"商城-购物车-小程序"})
+ public R delShoppingCart(Long id){
+ Long userid = tokenService.getLoginUserApplet().getUserid();
+ ShoppingCart shoppingCart = shoppingCartService.getById(id);
+ if(!userid.equals(shoppingCart.getAppUserId())){
+ return R.fail("权限不足，不允许此操作");
+ }
+ shoppingCartService.removeById(id);
+ return R.ok();
+ }
+
+
@ResponseBody
@PostMapping("/confirmOrder")
@ApiOperation(value = "确定购物车订单", tags = {"商城-购物车-小程序"})
- public AjaxResult<ConfirmOrderVo> confirmOrder(@RequestBody ConfirmOrder confirmOrder){
- // todo 待完善 pu
- return AjaxResult.success();
+ public R<ConfirmOrderVo> confirmOrder(@RequestBody ConfirmOrder confirmOrder){
+ ConfirmOrderVo confirmOrderVo = shoppingCartService.confirmOrder(confirmOrder);
+ return R.ok(confirmOrderVo);
}
@ResponseBody
@PostMapping("/shoppingCartPayment")
@ApiOperation(value = "购物车订单支付", tags = {"商城-购物车-小程序"})
- public AjaxResult shoppingCartPayment(@RequestBody ShoppingCartPayment shoppingCartPayment){
- // todo 待完善 pu
- return AjaxResult.success();
+ public R<String> shoppingCartPayment(@RequestBody ShoppingCartPayment shoppingCartPayment){
+ return shoppingCartService.shoppingCartPayment(shoppingCartPayment);
+ }
+
+
+ @ResponseBody
+ @GetMapping("/getVerifiableShop")
+ @ApiOperation(value = "获取可核销门店列表", tags = {"购物车-小程序"})
+ public R<List<VerifiableShopVo>> getVerifiableShop(){
+ LoginUser loginUser = tokenService.getLoginUserApplet();
+ List<ShoppingCart> shoppingCarts = shoppingCartService.list(new LambdaQueryWrapper<ShoppingCart>()
+ .eq(ShoppingCart::getAppUserId, loginUser.getUserid()));
+
+ List<Integer> goodsIds = shoppingCarts.stream().map(ShoppingCart::getGoodsId).collect(Collectors.toList());
+ GetGoodsShopByGoodsIds goodsShopByGoodsIds = new GetGoodsShopByGoodsIds();
+ goodsShopByGoodsIds.setGoodsIds(goodsIds);
+ R<List<GoodsShop>> r = goodsShopClient.getGoodsShopByGoodsIds(goodsShopByGoodsIds);
+ List<GoodsShop> goodsShops = r.getData();
+ List<VerifiableShopVo> verifiableShopVoList = new ArrayList<>();
+ if (CollectionUtil.isNotEmpty(goodsShops)){
+ for (GoodsShop goodsShop : goodsShops) {
+ R<Shop> shopR = shopClient.getShopById(goodsShop.getShopId());
+ if (R.isSuccess(shopR)){
+ VerifiableShopVo verifiableShopVo = new VerifiableShopVo();
+ verifiableShopVo.setId(shopR.getData().getId());
+ verifiableShopVo.setName(shopR.getData().getName());
+ verifiableShopVoList.add(verifiableShopVo);
+ }
+ }
+ }
+ return R.ok(verifiableShopVoList);
}
--
Gitblit v1.7.1