From d37ac1b495dd070e37209527bbedc1ce0730951a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 01 一月 2025 15:16:41 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 6ba0a73..25e73ec 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
@@ -2,6 +2,8 @@
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.TableDataInfo;
@@ -41,6 +43,8 @@
private GoodsShopClient goodsShopClient;
@Resource
private ShopClient shopClient;
+ @Resource
+ private AppUserClient appUserClient;
@@ -113,7 +117,7 @@
@GetMapping("/getVerifiableShop")
@ApiOperation(value = "获取可核销门店列表", tags = {"购物车-小程序"})
public R<List<VerifiableShopVo>> getVerifiableShop(){
- LoginUser loginUser = tokenService.getLoginUser();
+ LoginUser loginUser = tokenService.getLoginUserApplet();
List<ShoppingCart> shoppingCarts = shoppingCartService.list(new LambdaQueryWrapper<ShoppingCart>()
.eq(ShoppingCart::getAppUserId, loginUser.getUserid()));
@@ -126,7 +130,7 @@
if (CollectionUtil.isNotEmpty(goodsShops)){
for (GoodsShop goodsShop : goodsShops) {
R<Shop> shopR = shopClient.getShopById(goodsShop.getShopId());
- if (R.isSuccess(shopR)){
+ if (R.isSuccess(shopR) && null != shopR.getData()){
VerifiableShopVo verifiableShopVo = new VerifiableShopVo();
verifiableShopVo.setId(shopR.getData().getId());
verifiableShopVo.setName(shopR.getData().getName());
@@ -136,6 +140,14 @@
}
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);
+ return R.ok(price);
+ }
}
--
Gitblit v1.7.1