From 5a7de6a73c756ae8e7af2b3e002d6fb52c5cf04c Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 10 十月 2023 16:26:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index c65589a..793e679 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -372,15 +372,18 @@
List<RegisterOrderVO> res = packagePaymentService.listAllRegister(query);
List<RegisterOrderVO> result = new ArrayList<>();
- for (RegisterOrderVO re : res) {
- if(re.getSalesName()==null){
+ Iterator<RegisterOrderVO> iterator = res.iterator();
+ while (iterator.hasNext()) {
+ RegisterOrderVO re = iterator.next();
+
+ if (re.getSalesName() == null) {
re.setSalesName("无");
}
- if(re.getPayType()!=null){
- if (re.getPayType() == 3){
- re.setPayMoneyAndType(re.getPlayPaiCoin()+"玩湃币");
- }else{
- re.setPayMoneyAndType("￥"+re.getMoney());
+ if (re.getPayType() != null) {
+ if (re.getPayType() == 3) {
+ re.setPayMoneyAndType(re.getPlayPaiCoin() + "玩湃币");
+ } else {
+ re.setPayMoneyAndType("￥" + re.getMoney());
}
}
Store store = storeClient.queryStoreById(re.getStoreId());
@@ -390,6 +393,10 @@
re.setPayUser(appUser.getName());
re.setPhone(appUser.getPhone());
re.setStoreName(store.getName());
+ // 在这里添加条件来删除不满足要求的元素
+ if (appUser.getInsertType() != query.getInsertType()) {
+ iterator.remove(); // 使用迭代器的 remove 方法删除元素
+ }
}
return res;
}
--
Gitblit v1.7.1