From 5f3455e4b2aca57cc521d07b35eb36c7b7301e23 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 11 Dec 2020 13:49:16 +0800 Subject: [PATCH] fix car --- .../jieshun/JieShunParkCallbackService.java | 29 ----------------- .../park/impl/jieshun/JieShunParkService.java | 32 +++++++++---------- 2 files changed, 16 insertions(+), 45 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkCallbackService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkCallbackService.java index d551633af..f7e9e9844 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkCallbackService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkCallbackService.java @@ -90,35 +90,6 @@ public class JieShunParkCallbackService extends BaseParkService implements ParkB log.error("jieshun entranceTime format error",e); return null; } - //下订单; - WxPark pq = new WxPark(); - pq.setVendorType(EnumCarVendor.CAR_JIESHUN.getCode()); - pq.setParkId(parkCode); - WxPark park = wxParkService.getByObj(pq); - if (park == null ) { - log.error("wxPark jieshun parkCode :"+parkCode+" not fund"); - return null; - } - String retCode = jieshunParkService.createOrder(park, carNumber); - if (StringUtils.isBlank(retCode)) { - throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(), "jieshun createOrder error. has no result"); - } - JSONObject result = JSON.parseObject(retCode); - if (result.getInteger("resultCode") != 0 ) { - String message = result.getString("message"); - throw new MallinkException(result.getInteger("resultCode"), "jieshun createOrder error."+message); - } - String parkOrderId = result.getString("orderNo"); - //记录当前车牌的订单号 - WxCarJSOrder order = new WxCarJSOrder(); - order.setId(IdWorker.get().nextId()); - order.setCarNumber(realCarNumber); - order.updateTenantInfo(park); - order.setCreateTime(new Date()); - order.setUpdateTime(new Date()); - order.setStatus(1); - order.setOrderId(parkOrderId); - wxCarJSOrderMapper.insert(order); return p; } diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java index d40b86745..cc7a1ac69 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java @@ -1,5 +1,6 @@ package com.iformall.service.park.impl.jieshun; +import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -15,6 +16,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.iformall.common.ErrorCode; +import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.WxCarJSOrder; @@ -113,13 +115,6 @@ public class JieShunParkService extends BaseParkService implements ParkAdapterSe return null; } - /** - * 下订单 - */ - public String createOrder(WxPark park,String carNumber) { - return jieshun.createOrder(park, carNumber, getCacheToken(park)); - } - @Override public String bindCar(Map paramMap, WxPark park, WxCUserBasicInfo member) throws Exception{ @@ -132,6 +127,9 @@ public class JieShunParkService extends BaseParkService implements ParkAdapterSe } + /** + * 每一次查询都会产生订单,然后根据订单号查询 + */ @Override public ResultData carStopFee(Map paramMap, WxPark park) throws Exception{ return jieshunCarStopFee(paramMap, park); @@ -142,16 +140,18 @@ public class JieShunParkService extends BaseParkService implements ParkAdapterSe if (StringUtils.isBlank(carNumber)) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "carNumber为空"); } - - WxCarJSOrder order = new WxCarJSOrder(); - order.setCarNumber(carNumber); - order.setStatus(1); - WxCarJSOrder jsorder = wxCarJSOrderMapper.getOneOrder(order); - if (null == jsorder) { - return new ResultData(ErrorCode.CYF_STOP_FEE_FAIL.getCode(), "停车费获取失败:该车牌订单未查询到!"); + //下订单; + String retCode = jieshun.createOrder(park, carNumber, getCacheToken(park)); + if (StringUtils.isBlank(retCode)) { + throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(), "jieshun createOrder error. has no result"); } - - String ret = jieshun.getCarStopFee(park, jsorder.getOrderId(), getCacheToken(park)); + JSONObject result = JSON.parseObject(retCode); + if (result.getInteger("resultCode") != 0 ) { + String message = result.getString("message"); + throw new MallinkException(result.getInteger("resultCode"), "jieshun createOrder error."+message); + } + String parkOrderId = result.getString("orderNo"); + String ret = jieshun.getCarStopFee(park, parkOrderId, getCacheToken(park)); JSONObject retObj = JSON.parseObject(ret); if (retObj.getIntValue("resultCode") == 0){ return new ResultData(retObj);