From 232d3efb20f87f9c60faeda7bae4bc96e5687bd3 Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期三, 11 十月 2023 19:19:47 +0800 Subject: [PATCH] 10.12 --- cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 29 ++++++++++++++++++++++------- 1 files changed, 22 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..8ecc365 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 @@ -371,16 +371,27 @@ } List<RegisterOrderVO> res = packagePaymentService.listAllRegister(query); + // 该运营商下没有门店 + if (query.getStoresIds()!=null){ + if (query.getStoresIds().size()==0){ + List<RegisterOrderVO> registerOrderVOS = new ArrayList<>(); + return registerOrderVOS; + } + } + 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 +401,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