From acccff9860b271d55c55dc87486f7c20b9896e6c Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期一, 13 一月 2025 16:19:54 +0800 Subject: [PATCH] 修改bug --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java | 28 +--------------------------- 1 files changed, 1 insertions(+), 27 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 3f4c1a0..8083049 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 @@ -163,39 +163,13 @@ - @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) && null != shopR.getData()){ - VerifiableShopVo verifiableShopVo = new VerifiableShopVo(); - verifiableShopVo.setId(shopR.getData().getId()); - verifiableShopVo.setName(shopR.getData().getName()); - verifiableShopVoList.add(verifiableShopVo); - } - } - } - return R.ok(verifiableShopVoList); - } @GetMapping("/getGoodsPrice") public R<Price> getGoodsPrice(Long appUserId, Integer goodsId, Integer shopId){ AppUser appUser = appUserClient.getAppUserById(appUserId); - Price price = shoppingCartService.getPrice(appUser, goodsId, shopId); + Price price = shoppingCartService.getPrice(appUser, goodsId, 1, shopId); return R.ok(price); } -- Gitblit v1.7.1