1;每日消耗显示ai账分
This commit is contained in:
parent
17c00d71eb
commit
b328ccff4a
|
@ -70,7 +70,7 @@ public class BusIntegralConsumeController extends BaseController
|
||||||
List<BusIntegralRecord> list2 = busIntegralRecordService.selectBusIntegralRecordList1(busIntegralRecord);
|
List<BusIntegralRecord> list2 = busIntegralRecordService.selectBusIntegralRecordList1(busIntegralRecord);
|
||||||
list1 = list1.stream().map(bean -> {
|
list1 = list1.stream().map(bean -> {
|
||||||
for(BusIntegralRecord busIntegralRecord1:list2){
|
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());
|
bean.setAiIntegralUpdateNum(busIntegralRecord1.getIntegralUpdateNum());
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -137,7 +137,7 @@ public class BusIntegralConsumeController extends BaseController
|
||||||
List<BusIntegralRecord> list2 = busIntegralRecordService.selectBusIntegralRecordList1(busIntegralRecord);
|
List<BusIntegralRecord> list2 = busIntegralRecordService.selectBusIntegralRecordList1(busIntegralRecord);
|
||||||
list = list.stream().map(bean -> {
|
list = list.stream().map(bean -> {
|
||||||
for(BusIntegralRecord busIntegralRecord1:list2){
|
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());
|
bean.setAiIntegralUpdateNum(busIntegralRecord1.getIntegralUpdateNum());
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue