Преглед изворни кода

fix car

release_toaliyun_real
xiaohanzi пре 5 година
родитељ
комит
895432bdcf
2 измењених фајлова са 3 додато и 3 уклоњено
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunUtil.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java Прегледај датотеку

@@ -158,7 +158,7 @@ public class JieShunParkService extends BaseParkService implements ParkAdapterSe
String createTime = retObj.getString("createTime");//计费时间,格式为“yyyy-MM-dd HH:mi:ss” String createTime = retObj.getString("createTime");//计费时间,格式为“yyyy-MM-dd HH:mi:ss”
String endTime = retObj.getString("endTime");//离场时间,格式为“yyyy-MM-dd HH:mi:ss” String endTime = retObj.getString("endTime");//离场时间,格式为“yyyy-MM-dd HH:mi:ss”
String appId = "wx24b70f0ad2a9a89a"; String appId = "wx24b70f0ad2a9a89a";
String payPath = "pages/thirdPayOrder/payOrder?carNo="+jieshun.handleCarNumber(carNumber)+"&parkCode="+park.getParkId();
String payPath = "pages/thirdPayOrder/payOrder?carNo="+jieshun.handleCarNumber(carNumber)+"&parkCode="+park.getParkingId();
return new ResultData(new ParkStopFee(parkOrderId,jieshun.utcToLocal(createTime),jieshun.utcToLocal(endTime), return new ResultData(new ParkStopFee(parkOrderId,jieshun.utcToLocal(createTime),jieshun.utcToLocal(endTime),
String.valueOf(retObj.getDouble("totalFee")),appId,payPath,null)); String.valueOf(retObj.getDouble("totalFee")),appId,payPath,null));
}else { }else {


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunUtil.java Прегледај датотеку

@@ -140,7 +140,7 @@ public class JieShunUtil {
JSONObject vp = JSON.parseObject(vendroParams); JSONObject vp = JSON.parseObject(vendroParams);
Map param = new HashMap(); Map param = new HashMap();
param.put("businesserCode", vp.get("businesserCode"));//商户编号 param.put("businesserCode", vp.get("businesserCode"));//商户编号
param.put("parkCode", wxPark.getParkId());
param.put("parkCode", wxPark.getParkingId());
param.put("orderType", "VNP"); param.put("orderType", "VNP");
param.put("carNo", handleCarNumber(cardNumber)); param.put("carNo", handleCarNumber(cardNumber));
Map map = generateMap("3c.pay.createorderbycarno",param); Map map = generateMap("3c.pay.createorderbycarno",param);
@@ -191,7 +191,7 @@ public class JieShunUtil {
param.put("businesserCode", vp.get("businesserCode"));//商户编号 param.put("businesserCode", vp.get("businesserCode"));//商户编号
param.put("couponsNo", couponNo);//优惠券编号 param.put("couponsNo", couponNo);//优惠券编号
param.put("orderNo", orderNo);//商户编号 param.put("orderNo", orderNo);//商户编号
param.put("parkCode", wxPark.getParkId());
param.put("parkCode", wxPark.getParkingId());
Map map = generateMap("3c.coupons.use.coupons",param); Map map = generateMap("3c.coupons.use.coupons",param);
log.info("jieshun useCoupon :" + JSON.toJSONString(map)); log.info("jieshun useCoupon :" + JSON.toJSONString(map));
return ProcBussiness(COUPON_USE, wxPark.getParkingId(), map, token,vp.getString("version"),vp.getString("signkey")); return ProcBussiness(COUPON_USE, wxPark.getParkingId(), map, token,vp.getString("version"),vp.getString("signkey"));


Loading…
Откажи
Сачувај