Przeglądaj źródła

fix car bug

release_toaliyun_real
lin 2 lat temu
rodzic
commit
2848ed4376
2 zmienionych plików z 21 dodań i 3 usunięć
  1. +16
    -1
      mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxParkCallBackBaseController.java
  2. +5
    -2
      mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkCallbackService.java

+ 16
- 1
mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxParkCallBackBaseController.java Wyświetl plik

@@ -181,6 +181,9 @@ public class WxParkCallBackBaseController extends BaseController {
}
private Result handleSingleParkInCallBack(EnumCarVendor vendor,EnumCarCmd cmdType,ParkNotifyParam param ,Object sourceParam) {
if (null == param) {
return new Result();
}
String carNumber = param.getCarNumber();
@@ -250,6 +253,10 @@ public class WxParkCallBackBaseController extends BaseController {
}
private Result handleParkOutCallBackSingle(EnumCarVendor vendor,EnumCarCmd cmdType,ParkNotifyParam param,Object sourceParam) {
if (null == param) {
return new Result();
}
ParkCacheUtils.removeCache(redisTemplate, vendor.getMessage(), param.getCarNumber());
WxCarCmdLog wxCarCmdLog = null;
@@ -286,7 +293,11 @@ public class WxParkCallBackBaseController extends BaseController {
}
private Result handleUnbindCarCallBackSingle(EnumCarVendor vendor,EnumCarCmd cmdType,ParkNotifyParam param,Object sourceParam) {
WxCarCmdLog wxCarCmdLog = null;
if (null == param) {
return new Result(EnumETCPCode.SUCCESS.getCode(), EnumETCPCode.SUCCESS.getMessage());
}
WxCarCmdLog wxCarCmdLog = null;
try {
wxCarCmdLog = saveWxCarCmdLog(vendor, cmdType, sourceParam, param);
}catch(MallinkException e) {
@@ -325,6 +336,10 @@ public class WxParkCallBackBaseController extends BaseController {
private Result handlePaidCallbackSingle(EnumCarVendor vendor,EnumCarCmd cmdType,ParkNotifyParam param,Object sourceParam) {
if (null == param) {
return new Result(EnumETCPCode.SUCCESS.getCode(), EnumETCPCode.SUCCESS.getMessage());
}
WxCarCmdLog carCmdLogQ = new WxCarCmdLog();
String parkId = param.getParkId();
WxPark parkQ = new WxPark();


+ 5
- 2
mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkCallbackService.java Wyświetl plik

@@ -44,8 +44,8 @@ public class DaHuaParkCallbackService extends BaseParkService implements ParkCal
WxCarJSOrderMapper wxCarJSOrderMapper;
private String handleCarNumber(String carNumber) {
if (StringUtils.isBlank(carNumber)) {
return "空车牌";
if (StringUtils.isBlank(carNumber) || "无牌车".equals(carNumber)) {
return null;
}
if (carNumber.contains("-")) {
carNumber = carNumber.replaceAll("-", "");
@@ -68,6 +68,9 @@ public class DaHuaParkCallbackService extends BaseParkService implements ParkCal
ParkNotifyParam p = new ParkNotifyParam();
String realCarNumber = handleCarNumber(carNumber);
if (StringUtils.isBlank(realCarNumber)) {
return null;
}
p.setCarNumber(realCarNumber);
p.setParkId(parkCode);
p.setParkName(parkName);


Ładowanie…
Anuluj
Zapisz