From b3bf5a0b4fac7ba6bc85b2bdce5e05d55cdeb69f Mon Sep 17 00:00:00 2001 From: nickchange <126672920+nickchange@users.noreply.github.com> Date: 星期二, 28 十一月 2023 21:46:50 +0800 Subject: [PATCH] 11.27,9 --- cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java index dfc7229..afc238a 100644 --- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java +++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java @@ -324,7 +324,6 @@ } -// if (cIds.size()>0) { List<PointsMerchandise> merchandises = pmdsService.list(new QueryWrapper<PointsMerchandise>().in("id", cIds) .eq("state", 1) @@ -341,8 +340,9 @@ integralCommodity.setSort(merchandise.getSort()); commodity.add(integralCommodity); } -// } } + + System.out.println(commodity); return commodity; @@ -898,9 +898,9 @@ list3.add(44); detailsResponse.setRid(list3); }else { - ArrayList<Integer> list3 = new ArrayList<>(); - list3.add(43); - detailsResponse.setRid(list3); + ArrayList<Integer> list4 = new ArrayList<>(); + list4.add(43); + detailsResponse.setRid(list4); } } } -- Gitblit v1.7.1