From 3c3747b2882426687e44b34a5a7525d86f0c4ecd Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 14 Sep 2020 18:02:22 +0800 Subject: [PATCH] fix bug --- .../iformall/controller/WxLiveController.java | 2 +- .../service/park/impl/etcp/EtcpHelper.java | 51 ++++++++++--------- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java index c6ddc2c8a..b49666498 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxLiveController.java @@ -36,7 +36,7 @@ public class WxLiveController extends BaseController { resultData.data = wxMaService.getLiveService().getLiveInfo(start,limit); } catch (WxErrorException e) { logger.error("getLiveinfos error", e); - throw new MallinkException(ErrorCode.SYS_SERVER_ERROR); + throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"["+appId+"]getLiveinfos error"); } return resultData; } diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java b/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java index b52536b5d..634c25188 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java @@ -1,5 +1,6 @@ package com.iformall.service.park.impl.etcp; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -136,29 +137,33 @@ public class EtcpHelper { WxCUserCar queryUserCar = new WxCUserCar(); queryUserCar.setCUserId(cUserId); List uclist = wxCUserCarService.getList(queryUserCar); - // 删除ETCP不存在 - for (WxCUserCar userCar : uclist) { - boolean bExist = isExistInArray(arr, userCar.getCarNumber()); - if (!bExist) { - wxCUserCarService.deleteById(userCar.getId()); - uclist.remove(userCar); - } - } - // 添加ETCP的 - for (int i = 0; i < arr.size(); i++) { - String _carNum = arr.getString(i); - boolean bExist = isExistInList(uclist, _carNum); - if (!bExist) { - Date curr = new Date(); - WxCUserCar userCar = new WxCUserCar(); - userCar.setCUserId(cUserId); - userCar.updateTenantInfo(tenantEntity); - userCar.setCarNumber(_carNum); - userCar.setVendorType(EnumCarVendor.CAR_ETCP.getCode()); - userCar.setCreateDate(curr); - userCar.setUpdateDate(curr); - wxCUserCarService.saveOrUpdate(userCar); - } + if(null != uclist ) { + List ucclist = new ArrayList(); + ucclist.addAll(uclist); + // 删除ETCP不存在 + for (WxCUserCar userCar : uclist) { + boolean bExist = isExistInArray(arr, userCar.getCarNumber()); + if (!bExist) { + wxCUserCarService.deleteById(userCar.getId()); + ucclist.remove(userCar); + } + } + // 添加ETCP的 + for (int i = 0; i < arr.size(); i++) { + String _carNum = arr.getString(i); + boolean bExist = isExistInList(ucclist, _carNum); + if (!bExist) { + Date curr = new Date(); + WxCUserCar userCar = new WxCUserCar(); + userCar.setCUserId(cUserId); + userCar.updateTenantInfo(tenantEntity); + userCar.setCarNumber(_carNum); + userCar.setVendorType(EnumCarVendor.CAR_ETCP.getCode()); + userCar.setCreateDate(curr); + userCar.setUpdateDate(curr); + wxCUserCarService.saveOrUpdate(userCar); + } + } } return dataObj1; }