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; }