diff --git a/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java index c3ac8f1..73aa93c 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java @@ -92,9 +92,8 @@ public class ConsumeServiceImpl implements ConsumeService { List list = consumeMapper.selectBy(consumeUser); // 构造退款订单号 List refundOrderCodes = list.stream() - .map(ConsumeUser::getOrderCode) - .filter(Objects::nonNull) - .map(code -> "TK_" + code) + .filter(v -> v.getIsRefund() != null && v.getIsRefund() == 1) + .map(v -> "TK_" + v.getOrderCode()) .collect(Collectors.toList()); // 查询退款订单 diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml index 6e97d61..ecf3220 100644 --- a/src/main/resources/mapper/ConsumeMapper.xml +++ b/src/main/resources/mapper/ConsumeMapper.xml @@ -177,6 +177,8 @@ #{code} + AND type = 1 + AND flag = 1