Browse Source

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real

release_toaliyun_real
xhxu 2 years ago
parent
commit
31371aec3d
2 changed files with 8 additions and 3 deletions
  1. +6
    -3
      mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoParkService.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java

+ 6
- 3
mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoParkService.java View File

@@ -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){


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/park/impl/ketuo/KeTuoUtil.java View File

@@ -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);//车辆是否离场


Loading…
Cancel
Save