From 23faef11811adb1db22d58140911e70dc9263176 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 9 Apr 2021 16:41:12 +0800 Subject: [PATCH 1/3] fix bug --- .../main/java/com/iformall/service/park/impl/cyf/CYFUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFUtil.java b/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFUtil.java index 4e085411d..72f5921bd 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFUtil.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFUtil.java @@ -116,7 +116,7 @@ public class CYFUtil { **/ public String getCarStopFee(String token,String parkingId,String plates){ Map paramMap = new HashMap<>(); - paramMap.put("token ",token); + paramMap.put("token",token); paramMap.put("parkingId",Integer.valueOf(parkingId)); paramMap.put("plate",plates); paramMap.put("carOutTime",0); @@ -133,7 +133,7 @@ public class CYFUtil { */ public String unbindCar(String token,String parkingId,String vendorPersonId) { Map paramMap = new HashMap<>(); - paramMap.put("token ",token); + paramMap.put("token",token); paramMap.put("parkingId",Integer.valueOf(parkingId)); paramMap.put("personId",Integer.valueOf(vendorPersonId)); String result = Proc(UNBIND_CAR, paramMap); From ae72d92669422a88c921bafc30c8d8da3c0b036c Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 9 Apr 2021 17:16:42 +0800 Subject: [PATCH 2/3] fix bug --- .../service/park/impl/cyf/CYFParkService.java | 10 ++++++++++ .../iformall/service/park/impl/util/ParkHelper.java | 11 ++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java index 20e8f583d..ecb31ea83 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java @@ -15,6 +15,7 @@ import com.alibaba.fastjson.JSONObject; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCUserBasicInfo; +import com.iformall.domain.po.WxCUserCar; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxPark; import com.iformall.domain.vo.WxCouponOrderCarCVo; @@ -39,6 +40,15 @@ public class CYFParkService extends BaseParkService implements ParkAdapterServic @Override public String initLogin(Map paramMap, WxPark park, WxCUserBasicInfo member) throws Exception{ + String carNumber = paramMap.get("carNumber"); + if (StringUtils.isBlank(carNumber)) { + logger.error("carNumber为空"); + throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "carNumber为空"); + } + WxCUserCar car = parkHelper.getOne(park, member.getId(), carNumber, EnumCarVendor.CAE_CYF); + if (null != car) { + return car.getVendorPersonId(); + } return null; } diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java b/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java index 5f545ed01..67fb7f354 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java @@ -40,6 +40,15 @@ public class ParkHelper { @Autowired WxCreditHistoryService wxCreditHistoryService; + public WxCUserCar getOne(WxPark park, Long cuUserId,String carNumber,EnumCarVendor carVendor) { + WxCUserCar userCar = new WxCUserCar(); + userCar.updateTenantInfo(park); + userCar.setCUserId(cuUserId); + userCar.setCarNumber(carNumber); + userCar.setVendorType(carVendor.getCode()); + return wxCUserCarService.getOne(userCar); + } + public ResultData bindCar(Map paramMap, WxPark park, Long cuUserId,String vendorPersonId) { String carNumber = paramMap.get("carNumber"); if (StringUtils.isBlank(carNumber)) { @@ -53,7 +62,7 @@ public class ParkHelper { } catch (Exception e) { return new ResultData(500, e.getMessage()); } - return new ResultData(); + return new ResultData(vendorPersonId); } public void addCarInfoToDB(String carNumber, EnumCarVendor carVendor, WxPark park, Long cuUserId,String vendorPersonId) { From 00ba1e61c87aa3c4ca7a3219ea01babce716528d Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 9 Apr 2021 17:20:58 +0800 Subject: [PATCH 3/3] fix car cyf --- .../com/iformall/service/park/impl/cyf/CYFParkService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java index ecb31ea83..34dcf2426 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java @@ -132,10 +132,11 @@ public class CYFParkService extends BaseParkService implements ParkAdapterServic if (retObj.getIntValue("result") == 1){ Integer createTime = retObj.getInteger("inTime");//计费时间 Integer endTime = retObj.getInteger("endTime");//离场时间 + String msg = retObj.getString("warmPrompt"); String appId = ""; String payPath = ""; return new ResultData(new ParkStopFee(retObj.getString("orderId"), cyf.utcToLocal(String.valueOf(createTime)), - cyf.utcToLocal(String.valueOf(endTime)), String.valueOf(retObj.getDouble("fee")),appId,payPath,null,null)); + cyf.utcToLocal(String.valueOf(endTime)), String.valueOf(retObj.getDouble("fee")),appId,payPath,null,msg)); }else { logger.error("cyfCarStopFee error. paramMap: {} . cyfResult: {}",JSON.toJSONString(paramMap),ret); String msg = retObj.getString("strError");