Просмотр исходного кода

[停车][修改]:停车相关整理

release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
ec85e3b927
5 измененных файлов: 64 добавлений и 7 удалений
  1. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java
  2. +2
    -2
      mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java
  3. +1
    -1
      mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/utils/car/ETCPUtil.java
  5. +58
    -1
      mallinkService/src/main/java/com/iformall/utils/car/TJDCarUtil.java

+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java Просмотреть файл

@@ -15,8 +15,8 @@ import com.iformall.enums.EnumRentContractAppStatus;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxCouponMapper;
import com.iformall.service.*;
import com.iformall.utils.ETCPUtil;
import com.iformall.utils.TJDCarUtil;
import com.iformall.utils.car.ETCPUtil;
import com.iformall.utils.car.TJDCarUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;


+ 2
- 2
mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java Просмотреть файл

@@ -12,8 +12,8 @@ import com.iformall.domain.vo.WxMerchantVo;
import com.iformall.enums.*;
import com.iformall.exception.MallinkException;
import com.iformall.service.*;
import com.iformall.utils.ETCPUtil;
import com.iformall.utils.TJDCarUtil;
import com.iformall.utils.car.ETCPUtil;
import com.iformall.utils.car.TJDCarUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;


+ 1
- 1
mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java Просмотреть файл

@@ -12,7 +12,7 @@ import com.iformall.enums.EnumCouponSendSendType;
import com.iformall.enums.EnumETCPCode;
import com.iformall.service.*;
import com.iformall.utils.DateUtils;
import com.iformall.utils.ETCPUtil;
import com.iformall.utils.car.ETCPUtil;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;


mallinkService/src/main/java/com/iformall/utils/ETCPUtil.java → mallinkService/src/main/java/com/iformall/utils/car/ETCPUtil.java Просмотреть файл

@@ -1,4 +1,4 @@
package com.iformall.utils;
package com.iformall.utils.car;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;

mallinkService/src/main/java/com/iformall/utils/TJDCarUtil.java → mallinkService/src/main/java/com/iformall/utils/car/TJDCarUtil.java Просмотреть файл

@@ -1,7 +1,8 @@
package com.iformall.utils;
package com.iformall.utils.car;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.iformall.utils.MapUtil;
import org.apache.http.Consts;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
@@ -267,6 +268,62 @@ public class TJDCarUtil {
return result;
}

//// TODO
/**
* deductionNotSettle 停车费批量抵扣接口
* @param url
* @param partner
* @param key // 密钥
* @param version
* {
"service": "parkhub.order.deductionForDetail",
"partner": "120a565de377427184de35ca0f320764",
"sign": "3347b109a1e44f3fd5baa78b74a84948",
"signType": "md5",
"charset": "utf-8",
"version": "1.0",
"timestamp": "2016-05-26 11:30:10",
"tradeId": "c39d3aac49d04e12a187681e6189f841",
"accountId": "a9b2963c98344bb292e0fa3f7dd70946",
"prePayType": "3",
"giveFreeTimeOut": "false",
"detailList":"[{
},{
},{
\"outTradeNo\":\"PLDKY01\", \"identityType\":\"01\", \"identityId\":\"17710111111\", \"membershipGrade\":\"LV1\", \"amount\":\"12.50\", \"type\":\"0\", \"channel\":\"5013\", \"memo\":\"批量抵扣-金额-微信\"
\"outTradeNo\":\"PLDKY02\", \"identityType\":\"01\", \"identityId\":\"17710111111\", \"membershipGrade\":\"LV1\", \"couponType\":\"1\", \"minutes\":\"60\", \"type\":\"1\", \"channel\":\"2204\", \"memo\":\"批量抵扣-时长-会员卡券\"
\"outTradeNo\":\"PLDKY03\", \"identityType\":\"01\", \"identityId\":\"17710111111\", \"membershipGrade\":\"LV1\", \"couponType\":\"3\", \"startDt\":\"20180901110000\", \"endDt\":\"20180901170000\", \"integral\":\"500\",
\"type\":\"1\",
\"channel\":\"2205\", \"memo\":\"批量抵扣-区间-积分-会员补贴\"
}]"
}
* @throws Exception
*/
public static String deductionForDetail(String url, String partner, String key, String version,
String tradeId, String outTradeNo, String accountId, String deductionAmount) {
// 为指定订单抵扣停车费,如果此时车辆已经出场,返回isSuccess错误码为3,停简单系统不再接收此笔抵扣信息,对方系统 需要给用户发起退款。
String service = "parkhub.order.deductionNotSettle";
Map<String, String> paramMap = MapUtil.getOrderMap();
paramMap.put("tradeId", tradeId);
paramMap.put("deductionAmount", deductionAmount);
paramMap.put("outTradeNo", outTradeNo);
paramMap.put("accountId", accountId);
paramMap.put("charset", "utf-8");
paramMap.put("partner", partner);
paramMap.put("version", version);

String result = Proc(url, key, service, paramMap);
/*
"{\"timestamp\":\"1528534986636\",
\"returnCode\":\"T\",
\"prePayId\":\"7a1d52aa77ca487db4e61130394285bd\",
\"errorMSG\":\"\",
\"returnMsg\":\"OK\",
\"isSuccess\":\"0\"}[\\r][\\n]"
*/
return result;
}

/**
* deductionNotSettle 停车费无结算抵扣
* @param url

Загрузка…
Отмена
Сохранить