From 6f3c170403f34d452b5dc733043145d8d760fe41 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 05 Sep 2025 18:04:17 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/java/com/oying/modules/rider/utils/RiderSourceHttpUtils.java | 60 +++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 35 insertions(+), 25 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/rider/utils/RiderSourceHttpUtils.java b/oying-system/src/main/java/com/oying/modules/rider/utils/RiderSourceHttpUtils.java
index 346d4ed..1f616a6 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/utils/RiderSourceHttpUtils.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/utils/RiderSourceHttpUtils.java
@@ -11,7 +11,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
@@ -24,7 +27,7 @@
public class RiderSourceHttpUtils {
private static final Logger log = LoggerFactory.getLogger(RiderSourceHttpUtils.class);
- // private static final String URL = "http://1.14.71.182:5000/";
+ private static final String URL = "https://1.95.3.255:443/lyhd/api/contract/syncRiderContract";
// private static final String URL = "http://192.168.18.111:5000/";
@@ -66,32 +69,33 @@
* @return: riderSourceInfoHttp
* @author: pxb
*/
- public static RiderSourceInfoHttp getRiderSourceInfoHttp(String phone, String sourcePlatform) {
- HashMap<String, Object> paramMap = new HashMap<>(2);
- paramMap.put("phone", phone);
- paramMap.put("sourcePlatform", sourcePlatform);
- // String url = "";
+ public static RiderSourceInfoHttp getRiderSourceInfoHttp(List<String> phones, String sourcePlatform) {
+ HashMap<String, Object> param = new HashMap<>(2);
+ param.put("phones", phones);
+ param.put("sourcePlatform", sourcePlatform);
+ String url = URL;
// 转化成对象
RiderSourceInfoHttp riderSourceInfoHttp = new RiderSourceInfoHttp();
- // try {
- // String result = httpPostRequest(paramMap, url);
- // // 转换数据
- // riderSourceInfoHttp = riderConvertUtils(result);
- // } catch (Exception e) {
- // riderSourceInfoHttp.setCode("500");
- // riderSourceInfoHttp.setMessage("获取数据失败");
- // riderSourceInfoHttp.setSuccess("false");
- // return riderSourceInfoHttp;
- // }
- riderSourceInfoHttp.setCode(Constants.HTTP_CODE_SUCCESS);
- riderSourceInfoHttp.setMessage("请求成功");
- RiderSourceInfo riderSourceInfo = new RiderSourceInfo();
- riderSourceInfo.setSourcePlatform("LY");
- riderSourceInfo.setCardNum("123456789012345678");
- riderSourceInfo.setPhone("18706999997");
- riderSourceInfo.setCardName("张三");
- riderSourceInfo.setEnabled(Constants.SOURCE_ENABLED_ON);
- riderSourceInfoHttp.setData(riderSourceInfo);
+ try {
+ String result = httpPostRequest(param, url);
+ log.info("第三方骑手数据信息：{}", result);
+ // 转换数据
+ riderSourceInfoHttp = riderConvertUtils(result);
+ } catch (Exception e) {
+ riderSourceInfoHttp.setCode("500");
+ riderSourceInfoHttp.setMessage("获取数据失败");
+ riderSourceInfoHttp.setData(null);
+ return riderSourceInfoHttp;
+ }
+ // riderSourceInfoHttp.setCode(Constants.HTTP_CODE_SUCCESS);
+ // riderSourceInfoHttp.setMessage("请求成功");
+ // RiderSourceInfo riderSourceInfo = new RiderSourceInfo();
+ // riderSourceInfo.setSourcePlatform("LY");
+ // riderSourceInfo.setCardNum("123456789012345678");
+ // riderSourceInfo.setPhone("18706999997");
+ // riderSourceInfo.setCardName("张三");
+ // riderSourceInfo.setEnabled(Constants.SOURCE_ENABLED_ON);
+ // riderSourceInfoHttp.getData().add(riderSourceInfo);
return riderSourceInfoHttp;
}
@@ -113,4 +117,10 @@
return riderSourceInfoHttp;
}
}
+
+ public static void main(String[] args) {
+ List<String> phones = new ArrayList<>();
+ phones.add("13954532585");
+ RiderSourceHttpUtils.getRiderSourceInfoHttp(phones, "LY");
+ }
}
--
Gitblit v1.9.3