From b5ef1a23a99f11e5c9649f516327925713084b44 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 10 十二月 2024 14:33:24 +0800
Subject: [PATCH] 1.

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java |   83 +++++++++++++++++++++++++++++++++++++----
 1 files changed, 75 insertions(+), 8 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 6c92552..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,18 +1,30 @@
 package com.ruoyi.order.controller;
 
+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 model.ShoppingCart;
+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")
@@ -21,6 +33,17 @@
 
 	@Resource
 	private ShoppingCartService shoppingCartService;
+	
+	@Resource
+	private TokenService tokenService;
+
+	@Resource
+	private GoodsShopClient goodsShopClient;
+	@Resource
+	private ShopClient shopClient;
+	
+	
+	
 
 	
 	@ResponseBody
@@ -46,10 +69,26 @@
 	@ResponseBody
 	@PostMapping("/setGoodsNumber")
 	@ApiOperation(value = "修改购物车数量", tags = {"商城-购物车-小程序"})
-	public R<Void> setGoodsNumber(@RequestBody SetGoodsNumber setGoodsNumber){
-		// todo 待完善 pu
+	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();
 	}
+	
+	
 	
 	
 	
@@ -57,17 +96,45 @@
 	@PostMapping("/confirmOrder")
 	@ApiOperation(value = "确定购物车订单", tags = {"商城-购物车-小程序"})
 	public R<ConfirmOrderVo> confirmOrder(@RequestBody ConfirmOrder confirmOrder){
-		// todo 待完善 pu
-		return R.ok();
+		ConfirmOrderVo confirmOrderVo = shoppingCartService.confirmOrder(confirmOrder);
+		return R.ok(confirmOrderVo);
 	}
 	
 	
 	@ResponseBody
 	@PostMapping("/shoppingCartPayment")
 	@ApiOperation(value = "购物车订单支付", tags = {"商城-购物车-小程序"})
-	public R<Void> shoppingCartPayment(@RequestBody ShoppingCartPayment shoppingCartPayment){
-		// todo 待完善 pu
-		return R.ok();
+	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