From b328ccff4a59544a1e3e9f58909020a650ead41d Mon Sep 17 00:00:00 2001 From: wangshuai Date: Mon, 12 Aug 2024 19:48:22 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=9B=E6=AF=8F=E6=97=A5=E6=B6=88=E8=80=97?= =?UTF-8?q?=E6=98=BE=E7=A4=BAai=E8=B4=A6=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/controller/BusIntegralConsumeController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralConsumeController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralConsumeController.java index 95a5780..b647d95 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralConsumeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralConsumeController.java @@ -70,7 +70,7 @@ public class BusIntegralConsumeController extends BaseController List list2 = busIntegralRecordService.selectBusIntegralRecordList1(busIntegralRecord); list1 = list1.stream().map(bean -> { for(BusIntegralRecord busIntegralRecord1:list2){ - if(busIntegralRecord1.getAccount().equals(bean.getAccount())){ + if(busIntegralRecord1.getAccount().equals(bean.getAccount())&&busIntegralRecord1.getIntegralUpdateTime().equals(bean.getIntegralUpdateTime())){ bean.setAiIntegralUpdateNum(busIntegralRecord1.getIntegralUpdateNum()); break; } @@ -137,7 +137,7 @@ public class BusIntegralConsumeController extends BaseController List list2 = busIntegralRecordService.selectBusIntegralRecordList1(busIntegralRecord); list = list.stream().map(bean -> { for(BusIntegralRecord busIntegralRecord1:list2){ - if(busIntegralRecord1.getAccount().equals(bean.getAccount())){ + if(busIntegralRecord1.getAccount().equals(bean.getAccount())&&busIntegralRecord1.getIntegralUpdateTime().equals(bean.getIntegralUpdateTime())){ bean.setAiIntegralUpdateNum(busIntegralRecord1.getIntegralUpdateNum()); break; }