diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java index b693a48..bdfa3db 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java @@ -617,16 +617,16 @@ public class MeituanServiceImpl implements IMeituanService { jsonObject = JSONObject.parseObject(resp); code = jsonObject.getString(("code")); }catch (Exception e1) { - log.error("==============="+orderInfo.getOrderNo()+"隧道代理订单解析号码出错:" + e1.getMessage() + "===========转换私密代理"); + log.error("==============="+orderInfo.getOrderNo()+"隧道代理订单解析号码出错:" + e1.getMessage() + "===========转换隧道代理2"); try { - client = proxyHttpClient2(proxyProperties.getUrl()); + client = proxyHttpClient(); HttpResponse response = client.execute(httpPost); HttpEntity responseEntity = response.getEntity(); String resp = EntityUtils.toString(responseEntity); jsonObject = JSONObject.parseObject(resp); code = jsonObject.getString(("code")); }catch (Exception e2){ - log.error("==============="+orderInfo.getOrderNo()+"私密代理订单解析号码出错:" + e2.getMessage() + "===========转换本地代理"); + log.error("==============="+orderInfo.getOrderNo()+"隧道代理2订单解析号码出错:" + e2.getMessage() + "===========转换本地代理"); client = localHttpClient(); try { HttpResponse response = client.execute(httpPost); diff --git a/ruoyi-system/src/main/resources/mapper/business/BusOrderInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusOrderInfoMapper.xml index 097d7bc..d5cb0df 100644 --- a/ruoyi-system/src/main/resources/mapper/business/BusOrderInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/business/BusOrderInfoMapper.xml @@ -57,8 +57,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN bus_order_info a on b.phone_number=a.privcy_phone where b.return_visit_time is null and b.phone_number != '' and a.store_code = #{storeCode} --- and a.complete_time > #{t1} --- and a.complete_time <= #{t2} and a.complete_time between #{t1} and #{t2} GROUP BY a.privcy_phone,a.order_no ) AS t2 ON t1.order_no = t2.order_no AND t1.id = t2.min_id @@ -74,9 +72,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN bus_order_info a on b.phone_number=a.privcy_phone where b.return_visit_time is null and b.phone_number != '' and a.store_code = #{storeCode} --- and a.order_time <= #{t2} --- and a.order_time > #{t1} --- and a.order_time <= #{t2} and a.order_time between #{t1} and #{t2} GROUP BY a.privcy_phone,a.order_no ) AS t2 ON t1.order_no = t2.order_no AND t1.id = t2.min_id;