From 73dbc706cadaaa46a2cf930efbc74daa05101d04 Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Fri, 4 Jul 2025 13:58:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=A9=BA=E6=A0=BC=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/demo/serviceImpl/GeneralServiceImpl.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java index c3cce46..74166b0 100644 --- a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java @@ -8,10 +8,8 @@ import org.springframework.stereotype.Service; import java.time.LocalDateTime; import java.time.LocalTime; import java.time.ZoneId; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; /** * @program: GOLD @@ -42,13 +40,22 @@ public class GeneralServiceImpl implements GeneralService { @Override public List getGoods() { List list = generalMapper.getGoods(); - return list; + // 使用 Java 8 的 Stream API 过滤 null 和空字符串 + List filteredList = list.stream() + .filter(Objects::nonNull) // 过滤掉 null 值 + .filter(str -> !str.trim().isEmpty()) // 过滤掉空字符串和仅包含空白字符的字符串 + .collect(Collectors.toList()); + return filteredList; } @Override public List getActivity() { List list = generalMapper.getActivity(); - return list; + List filteredList = list.stream() + .filter(Objects::nonNull) // 过滤掉 null 值 + .filter(str -> !str.trim().isEmpty()) // 过滤掉空字符串和仅包含空白字符的字符串 + .collect(Collectors.toList()); + return filteredList; } From 419059ff4bff6a2a0a2798c747fc8fcb839bc6fd Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Fri, 4 Jul 2025 15:01:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A9=BA=E6=A0=BC=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java index b46e73b..e1c8b6e 100644 --- a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java @@ -160,6 +160,7 @@ public class RefundServiceImpl implements RefundService { String combined = orderCode + "_" + goodsName; RefundUser refundUser = new RefundUser(); refundUser.setGoodsName(combined); + refundUser.setSumGold(record.getPermanentGold()+record.getFreeGold()+record.getTaskGold()); refundUser.setPermanentGold(record.getPermanentGold()); refundUser.setFreeGold(record.getFreeGold()); refundUser.setTaskGold(record.getTaskGold());