From 2526190b209e74f3f882eaf19cc95d333589d7b8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 14 一月 2026 10:04:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsShopController.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsShopController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsShopController.java
index d555b72..44efcfc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsShopController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsShopController.java
@@ -184,21 +184,21 @@
if (goodsIds.isEmpty()){
ShopCarVO shopCarVO = new ShopCarVO();
shopCarVO.setTotalPrice(BigDecimal.ZERO);
- shopCarVO.setList(new PageInfo<>());
+ shopCarVO.setList(new ArrayList<>());
return R.ok(shopCarVO);
}
TErpGoodsShopQuery tErpGoodsShopQuery = new TErpGoodsShopQuery();
tErpGoodsShopQuery.setGoodsIds(goodsIds);
- PageInfo<TErpGoodsVO> tErpGoodsVOPageInfo = erpGoodsService.pageShopList(tErpGoodsShopQuery);
- List<TErpGoodsVO> records = tErpGoodsVOPageInfo.getRecords();
- for (TErpGoodsVO record : records) {
- for (ShoppingCartItem cartItem : cacheList) {
- if (cartItem.getId().equals(record.getId())) {
- record.setNumber(cartItem.getNum());
- record.setPrice(record.getSalesAmount().multiply(new BigDecimal(record.getNumber())).setScale(2, RoundingMode.HALF_UP));
- }
- }
- }
+// PageInfo<TErpGoodsVO> tErpGoodsVOPageInfo = erpGoodsService.pageShopList(tErpGoodsShopQuery);
+// List<TErpGoodsVO> records = tErpGoodsVOPageInfo.getRecords();
+// for (TErpGoodsVO record : records) {
+// for (ShoppingCartItem cartItem : cacheList) {
+// if (cartItem.getId().equals(record.getId())) {
+// record.setNumber(cartItem.getNum());
+// record.setPrice(record.getSalesAmount().multiply(new BigDecimal(record.getNumber())).setScale(2, RoundingMode.HALF_UP));
+// }
+// }
+// }
List<TErpGoodsVO> listAll = erpGoodsService.pageShopListAll(tErpGoodsShopQuery);
for (TErpGoodsVO record : listAll) {
for (ShoppingCartItem cartItem : cacheList) {
@@ -208,8 +208,8 @@
}
}
}
- BigDecimal totalPrice = records.stream().map(TErpGoodsVO::getPrice).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
- res.setList(tErpGoodsVOPageInfo);
+ BigDecimal totalPrice = listAll.stream().map(TErpGoodsVO::getPrice).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+ res.setList(listAll);
res.setTotalPrice(totalPrice);
return R.ok(res);
}
--
Gitblit v1.7.1