From 48a5ae1f50072d2ba5da6a0ef1dd22b28a9bceb7 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 18 Jul 2019 10:30:45 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=81=9C=E8=BD=A6][=E4=BF=AE=E6=94=B9]:code?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../callback/WxCarCallBackController.java | 51 +++++++++++-------- .../java/com/iformall/utils/ETCPUtil.java | 15 ++++++ 2 files changed, 45 insertions(+), 21 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java index 3a2890cff..7039fb0bb 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java @@ -10,6 +10,7 @@ import com.iformall.enums.EnumCarVendor; import com.iformall.enums.EnumCouponSendSendType; import com.iformall.enums.EnumETCPCode; import com.iformall.service.*; +import com.iformall.utils.ETCPUtil; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -87,7 +88,7 @@ public class WxCarCallBackController extends BaseController { wxCarCmdLog.setCreateDate(currentDate); wxCarCmdLog.setUpdateDate(currentDate); - String etcpParkId = paramMap.get("parkId"); + String etcpParkId = paramMap.get(ETCPUtil.ETCP_PARK_ID); String tenantId = "456"; WxPark parkQ = new WxPark(); parkQ.setVendorType(EnumCarVendor.CAR_ETCP.getCode()); @@ -101,14 +102,14 @@ public class WxCarCallBackController extends BaseController { wxCarCmdLog.setTenantId(park.getTenantId()); } - String carNumber = paramMap.get("plateNumber"); - String synId = paramMap.get("synId"); - String parkId = paramMap.get("parkId"); - String parkName = paramMap.get("parkName"); - String userType = paramMap.get("userType"); - String entranceTime = paramMap.get("entranceTime"); - String fixParkingId = paramMap.get("fixParkingId"); - String remainingDays = paramMap.get("remainingDays"); + String carNumber = paramMap.get(ETCPUtil.ETCP_CAR_NUMBER); + String synId = paramMap.get(ETCPUtil.ETCP_SYN_ID); + String parkId = paramMap.get(ETCPUtil.ETCP_PARK_ID); + String parkName = paramMap.get(ETCPUtil.ETCP_PARK_NAME); + String userType = paramMap.get(ETCPUtil.ETCP_USER_TYPE); + String entranceTime = paramMap.get(ETCPUtil.ETCP_ENTRANCE_TIME); + String fixParkingId = paramMap.get(ETCPUtil.ETCP_FIX_PARKING_ID); + String remainingDays = paramMap.get(ETCPUtil.ETCP_REMAINING_DAYS); // 检查是否有重复数据 HashMap map = new HashMap(); @@ -215,7 +216,7 @@ public class WxCarCallBackController extends BaseController { wxCarCmdLog.setCreateDate(currentDate); wxCarCmdLog.setUpdateDate(currentDate); - String etcpParkId = paramMap.get("parkId"); + String etcpParkId = paramMap.get(ETCPUtil.ETCP_PARK_ID); WxPark parkQ = new WxPark(); parkQ.setVendorType(EnumCarVendor.CAR_ETCP.getCode()); parkQ.setParkingId(etcpParkId); @@ -234,15 +235,19 @@ public class WxCarCallBackController extends BaseController { return true; } + String synId = paramMap.get(ETCPUtil.ETCP_SYN_ID); + String exitTime = paramMap.get(ETCPUtil.ETCP_EXIT_TIME); + String stayedTime = paramMap.get(ETCPUtil.ETCP_STAYED_TIME); + try { // 保存WxCarPayRecord WxCarPayRecord record = new WxCarPayRecord(); - record.setSynId(paramMap.get("synId")); - if(StringUtils.isNotBlank(paramMap.get("exitTime"))) { - record.setExitTime(new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(paramMap.get("exitTime"))); + record.setSynId(synId); + if(StringUtils.isNotBlank(exitTime)) { + record.setExitTime(dateFormat.parse(exitTime)); } - if(StringUtils.isNotBlank(paramMap.get("stayedTime"))) { - record.setStayedTime(Long.parseLong(paramMap.get("stayedTime"))); + if(StringUtils.isNotBlank(stayedTime)) { + record.setStayedTime(Long.parseLong(stayedTime)); } wxCarPayRecordService.updateBySynId(record); } catch (Exception e) { @@ -311,7 +316,7 @@ public class WxCarCallBackController extends BaseController { String carNumber = paramMap.get("plateNumber"); // 根据orderId获取入场信息,确定租户ID - String orderId = paramMap.get("orderId"); + String orderId = paramMap.get(ETCPUtil.ETCP_ORDER_ID); HashMap map = new HashMap(); map.put("synId", orderId); String tenant_id = wxCarCmdLogService.getTenantIdBySynId(map); @@ -342,15 +347,19 @@ public class WxCarCallBackController extends BaseController { return new Result(ErrorCode.DB_FAIL.getCode(), "入库错误" + paramMap.toString()); } + String paidServiceFee = paramMap.get(ETCPUtil.ETCP_PAID_SERVICE_FEE); + String etcpTime = paramMap.get(ETCPUtil.ETCP_TIME); + String fee = paramMap.get("fee"); + try { // 保存WxCarPayRecord WxCarPayRecord record = new WxCarPayRecord(); - record.setSynId(paramMap.get("orderId")); - record.setPaidServiceFee(paramMap.get("paidServiceFee")); - if(StringUtils.isNotBlank(paramMap.get("time"))) { - record.setFeeTime(new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(paramMap.get("time"))); + record.setSynId(orderId); + record.setPaidServiceFee(paidServiceFee); + if(StringUtils.isNotBlank(etcpTime)) { + record.setFeeTime(dateFormat.parse(etcpTime)); } - record.setFee(paramMap.get("fee")); + record.setFee(fee); wxCarPayRecordService.updateBySynId(record); } catch (Exception e) { logger.error("WxCarPayRecord: 缴费更新错误 " + paramMap.toString()); diff --git a/mallinkService/src/main/java/com/iformall/utils/ETCPUtil.java b/mallinkService/src/main/java/com/iformall/utils/ETCPUtil.java index 9cea00079..7ab87801e 100755 --- a/mallinkService/src/main/java/com/iformall/utils/ETCPUtil.java +++ b/mallinkService/src/main/java/com/iformall/utils/ETCPUtil.java @@ -26,6 +26,21 @@ import java.time.format.DateTimeFormatter; */ public class ETCPUtil { + public static final String ETCP_PARK_ID = "parkId"; + public static final String ETCP_CAR_NUMBER = "plateNumber"; + public static final String ETCP_SYN_ID = "synId"; + public static final String ETCP_PARK_NAME = "parkName"; + public static final String ETCP_USER_TYPE = "userType"; + public static final String ETCP_ENTRANCE_TIME = "entranceTime"; + public static final String ETCP_FIX_PARKING_ID = "fixParkingId"; + public static final String ETCP_REMAINING_DAYS = "remainingDays"; + public static final String ETCP_EXIT_TIME = "exitTime"; + public static final String ETCP_STAYED_TIME = "stayedTime"; + public static final String ETCP_ORDER_ID = "orderId"; + public static final String ETCP_PAID_SERVICE_FEE = "paidServiceFee"; + public static final String ETCP_TIME = "time"; + public static final String ETCP_FEE = "fee"; + private static final Logger logger = LoggerFactory.getLogger(ETCPUtil.class); /**