From 04cf935a279e8de3da211cd7869398215e23525a Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Wed, 12 Jul 2023 11:07:20 +0800 Subject: [PATCH 1/2] fix car bug --- .../service/park/impl/ketuo/KeTuoParkService.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoParkService.java index 82f0a968b..58a846fdc 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoParkService.java @@ -1,5 +1,6 @@ package com.iformall.service.park.impl.ketuo; +import java.math.BigDecimal; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -122,7 +123,8 @@ public class KeTuoParkService extends BaseParkService implements ParkAdapterServ if (null == retObject ) { throw new MallinkException(retObj.getInteger("resCode"), "ketuo getCarStopFee error. no order result"+carNumber); } - Double totalFee = retObject.getDouble("payable"); + Double totalFee = retObject.getDouble("payable");//分 + String _fee = String.valueOf(new BigDecimal(totalFee).divide(new BigDecimal(100)).doubleValue()); String appId = "wx54e676273869baa6"; String parkOrderId = retObject.getString("orderNo"); Integer freeMinute = (Integer)park.getVendorParamsByKey("freeMinute"); @@ -130,7 +132,7 @@ public class KeTuoParkService extends BaseParkService implements ParkAdapterServ String endTime = retObject.getString("payTime");//离场时间,格式为“yyyy-MM-dd HH:mi:ss” String payPath = "pages/index/index?lotId="+Integer.parseInt(park.getParkingId())+"&lpn="+carNumber; return new ParkStopFee(parkOrderId,ketuo.utcToLocal(createTime),ketuo.utcToLocal(endTime), - String.valueOf(totalFee),appId,payPath,null,null,"请支付后"+freeMinute+"分钟内离场"); + _fee,appId,payPath,null,null,"请支付后"+freeMinute+"分钟内离场"); }else { logger.error("ketuoCarStopFee error. paramMap: {} . ketuoResult: {}",JSON.toJSONString(paramMap),ret); String msg = retObj.getString("resMsg"); @@ -167,7 +169,8 @@ public class KeTuoParkService extends BaseParkService implements ParkAdapterServ boolean isReduceMoney = this.isReduceMoney(coupon); Integer reduceValue = this.getReduceValue(coupon); - String executeRet = ketuo.executediscount(park, fee.getOrderId(), planNo, Integer.parseInt(fee.getRemainingFee()),isReduceMoney, reduceValue); + Integer parkFee = new BigDecimal(fee.getRemainingFee()).multiply(new BigDecimal(100)).intValue(); + String executeRet = ketuo.executediscount(park, fee.getOrderId(), planNo, parkFee,isReduceMoney, reduceValue); logger.info("ketuo executediscount result:"+executeRet); JSONObject executeRetObj = JSON.parseObject(executeRet); if (executeRetObj.getIntValue("resCode") == 0){ From 86780cd8adfc4a58e4e600024e4f818eb0b5af6c Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Wed, 12 Jul 2023 11:21:03 +0800 Subject: [PATCH 2/2] fix bug --- .../java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java index 4725e0262..9a4e7e0f7 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java @@ -74,7 +74,9 @@ public class KeTuoUtil { param.put("payMethod", 1010);//付款方式 if (isDiscountMoney) { param.put("freeMoney", discountValue);//减免总金额(单位 分) + param.put("freeTime", 0); }else { + param.put("freeMoney", 0); param.put("freeTime", discountValue*3600);//减免总时长(单位 秒) } param.put("isCarLeave", 0);//车辆是否离场