Merge branch 'pxb' into xin

xin

5 days ago 044a57d2133b2363a6f0d3d167b3eaa587c70b91

 oying-system/src/main/java/com/oying/modules/rider/utils/RiderSourceHttpUtils.java

@@ -6,11 +6,15 @@
import cn.hutool.http.HttpResponse;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.oying.modules.rider.domain.RiderSourceInfo;
import com.oying.modules.rider.domain.RiderSourceInfoHttp;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;


/**
@@ -23,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/";


@@ -52,7 +56,6 @@
            RiderSourceInfoHttp riderSourceInfoHttp = new RiderSourceInfoHttp();
            riderSourceInfoHttp.setCode("500");
            riderSourceInfoHttp.setMessage(paramMap.get("phone") + "手机号请求异常：" + url);
            riderSourceInfoHttp.setSuccess("false");
            return JSON.toJSONString(riderSourceInfoHttp);
        } finally {
            IoUtil.close(response);
@@ -66,23 +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("produceType", 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);
            String result = httpPostRequest(param, url);
            log.info("第三方骑手数据信息：{}", result);
            // 转换数据
            riderSourceInfoHttp = riderConvertUtils(result);
        } catch (Exception e) {
            riderSourceInfoHttp.setCode("500");
            riderSourceInfoHttp.setMessage("获取数据失败");
            riderSourceInfoHttp.setSuccess("false");
            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;
    }

@@ -101,8 +114,13 @@
        } catch (Exception e) {
            riderSourceInfoHttp.setCode("500");
            riderSourceInfoHttp.setMessage("转化数据失败");
            riderSourceInfoHttp.setSuccess("false");
            return riderSourceInfoHttp;
        }
    }

    public static void main(String[] args) {
        List<String> phones = new ArrayList<>();
        phones.add("13954532585");
        RiderSourceHttpUtils.getRiderSourceInfoHttp(phones, "LY");
    }
}