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

[停车][修改]:TJD

release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
e5db665164
4 измененных файлов: 23 добавлений и 34 удалений
  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. +0
    -1
      mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarTJDCallBackController.java
  4. +19
    -29
      mallinkService/src/main/java/com/iformall/utils/car/TJDUtil.java

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

@@ -16,7 +16,7 @@ import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxCouponMapper;
import com.iformall.service.*;
import com.iformall.utils.car.ETCPUtil;
import com.iformall.utils.car.TJDCarUtil;
import com.iformall.utils.car.TJDUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -37,7 +37,7 @@ public class WxCarController extends BaseController {

ETCPUtil etcp = new ETCPUtil();

TJDCarUtil tjd = new TJDCarUtil();
TJDUtil tjd = new TJDUtil();

@Autowired
WxParkService wxParkService;


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

@@ -13,7 +13,7 @@ import com.iformall.enums.*;
import com.iformall.exception.MallinkException;
import com.iformall.service.*;
import com.iformall.utils.car.ETCPUtil;
import com.iformall.utils.car.TJDCarUtil;
import com.iformall.utils.car.TJDUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -37,7 +37,7 @@ public class WxCarController extends BaseController {

ETCPUtil etcp = new ETCPUtil();

TJDCarUtil tjd = new TJDCarUtil();
TJDUtil tjd = new TJDUtil();

@Autowired
WxParkService wxParkService;


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

@@ -6,7 +6,6 @@ import com.iformall.domain.po.*;
import com.iformall.enums.EnumCarCmd;
import com.iformall.enums.EnumCarVendor;
import com.iformall.service.*;
import com.iformall.utils.car.TJDCarUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;


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

@@ -28,18 +28,18 @@ import java.util.Map;
* 停简单 停车管理
*/
@Component
public class TJDCarUtil {
public class TJDUtil {

private final static Logger logger = LoggerFactory.getLogger(TJDCarUtil.class);
private final static Logger logger = LoggerFactory.getLogger(TJDUtil.class);

private static String baseurl = "http://prep.tingjiandan.com/openapi/gateway";

private static String partner = "7dbc8ec9037d403b822cb60addfdc681";
private static String key = "f356cb1bf5a74fb7a564e86128d2c49f";
private static String partner = "fb21a5b2f7064ff5afb8288d5bb48ca8";
private static String key = "bc2f09be8f5b4227898346cf6fe451c2";
private static String version = "1.0";

public static void main(String[] args) throws Exception {
String carNumber = "京HLTT01";
String carNumber = "京XAZMF1";

String result = infoForFreeMins(baseurl, partner, key, version, carNumber);

@@ -240,30 +240,20 @@ public class TJDCarUtil {
String result = Proc(url, key, service, paramMap);

/*
"{
\"wLon\":\"116.310335\",
\"returnCode\":\"T\",
\"lon\":\"116.316819\",
\"accountId\":\"5b3c15e15235486eba9abae41ae3f820\",
\"freeThroughTime\":\"30\",
\"customerServicePhone\":\"400-001-0606\",
\"tradeId\":\"3a3475c501f8464cbb3ff1b6670690d6\",
\"returnMsg\":\"OK\",
\"outDt\":\"20180609164753\",
\"isSuccess\":\"0\",
\"pmParkId\":\"7715622dff834b34a44448b801c27607\",
\"unPayAmount\":\"12.00\",
\"timestamp\":\"1528534070691\",
\"errorMSG\":\"\",
\"parkTime\":\"107273\",
\"wLat\":\"39.93609\",
\"totalAmount\":\"12.00\",
\"paidAmount\":\"0.00\",
\"freeMinsAmount\":\"0\",
\"payUrl\":\"https://prep.tingjiandan.com/tcweixin/letter/prePay/payInPark.html?prePayType=16&channel=30040&isShowDetail=true&orderId=3a3475c501f8464cbb3ff1b6670690d6\",
\"lat\":\"39.942078\",
\"inDt\":\"20180608110000\"
}\n";
{
"wLon":"116.310335",
"returnCode":"T",
"lon":"116.316813",
"accountId":"818a6ac865e841119ec9aab21c5e5a24",
"freeThroughTime":"10",
"customerServicePhone":"400-001-0606",
"tradeId":"2ae003431584495081014428c90173ab",
"returnMsg":"OK",
"outDt":"20190920110443",
"isSuccess":"0",
"miniProgram":"{\"path\": \"pages/pre_pay/index/main\",\"extraData\": {\"prePayType\": \"16\",\"channel\": \"30166\",\"isShowDetail\": \"true\",\"partnerId\": \"956ca31ac8464cf7b6a876e8887912f3\",\"orderId\": \"2ae003431584495081014428c90173ab\"}}","pmParkId":"7715622dff834b34a44448b801c27607","unPayAmount":"88.12","timestamp":"1568948681580","errorMSG":"","parkTime":"81629","wLat":"39.93609","totalAmount":"88.12","paidAmount":"0.00","freeMinsAmount":"0.00","payUrl":"https://prep.tingjiandan.com/tcweixin/letter/prePay/pagePayInPark?prePayType=16&channel=30166&isShowDetail=true&partnerId=&orderId=2ae003431584495081014428c90173ab&returnUrl=",
"lat":"39.942078",
"inDt":"20190919122414"}
*/
return result;
}

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