From 7f17403bc48886ce62fa90116daa2a109ebcdb28 Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 23 Jan 2019 17:53:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=81=9C=E8=BD=A6=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxCarCallBackController.java | 4 +++- .../iformall/service/impl/WxCUserBasicInfoServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarCallBackController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCarCallBackController.java index b83d9c807..f36e91881 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarCallBackController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCarCallBackController.java @@ -137,7 +137,9 @@ public class WxCarCallBackController extends BaseController { record.setParkName(jsonMap.get("parkName")); record.setUserType(jsonMap.get("userType")); record.setPlateNumber(jsonMap.get("plateNumber")); - record.setEntranceTime(new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(jsonMap.get("entranceTime"))); + if(StringUtils.isNotBlank(jsonMap.get("entranceTime"))) { + record.setEntranceTime(new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(jsonMap.get("entranceTime"))); + } record.setFixParkingId(jsonMap.get("fixParkingId")); record.setRemainingDays(jsonMap.get("remainingDays")); record.setPhone(phoneStrs); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 72914ffbd..fc69aee85 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -664,7 +664,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { cell3.setCellValue("进场时间"); cell4.setCellValue("出场时间"); cell5.setCellValue("停车时长(分钟)"); - cell6.setCellValue("缴费金额"); + cell6.setCellValue("缴费金额(元)"); for (int i = 0; i < carPayList.size(); i++) { rowtwo = sheetTwo.createRow(i + 1);