From fe5e00cb00ba4051830c19cb7a27bc2da4390905 Mon Sep 17 00:00:00 2001 From: wangshuai Date: Fri, 9 Aug 2024 20:59:55 +0800 Subject: [PATCH] =?UTF-8?q?1;=E4=BB=A3=E7=90=86=E9=A1=B5=E5=8A=A0=E5=BA=8F?= =?UTF-8?q?=E5=8F=B7=E5=88=97=202=EF=BC=9B=E6=A8=A1=E6=9D=BF=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E6=96=87=E6=9C=AC=E5=90=8D=203=EF=BC=9B=E8=90=A5?= =?UTF-8?q?=E9=94=80=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/business/controller/BusStoreInfoController.java | 2 +- .../com/ruoyi/business/service/impl/AiServiceImpl.java | 3 +++ .../ruoyi/business/service/impl/MeituanServiceImpl.java | 3 ++- ruoyi-ui/src/views/agent/list/index.vue | 7 ++++++- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java index f3cc965..a9e68a9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java @@ -212,7 +212,7 @@ public class BusStoreInfoController extends BaseController { content = content.replaceAll("#five",busStoreDayInfo1.getLastFiveStarReviewsNum()+""); content = content.replaceAll("#score", busStoreDayInfo1.getScore()); content = content.replaceAll("#QRCode", busTemplateInfo.getCodeUrl()==null?"":ruoYiConfig.getBaseUrl()+busTemplateInfo.getCodeUrl()); - content = content.replaceAll("#text", busTemplateInfo.getRemark()==null?"":busTemplateInfo.getRemark()); + content = content.replaceAll("文本：#text", busTemplateInfo.getRemark()==null?"":busTemplateInfo.getRemark()); int a = busStoreDayInfo1.getLastPositiveReviewsNum();//todo 好评-五星 int b = busStoreDayInfo1.getLastReturnVisitNum(); if (a != 0 && b != 0) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java index c9a4c76..a73ab12 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java @@ -285,6 +285,9 @@ public class AiServiceImpl implements IAiService { continue; } for (BusOrderInfo busOrderInfo : newList) { + if(!busOrderInfo.getPrivcyPhone().contains(",")){ + continue; + } MqDataInfo mqDataInfo = new MqDataInfo(); mqDataInfo.setAgentInfo(agentInfo); mqDataInfo.setStoreInfo(busStoreInfo); 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 d421583..4d7dec7 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 @@ -304,6 +304,7 @@ public class MeituanServiceImpl implements IMeituanService { */ @Override public String orderInfoList() { + log.error(("拉取订单开始: ")); BusStoreInfo busStoreInfo = new BusStoreInfo(); busStoreInfo.setReturnVisitStatus("1"); String getUrl = proxyProperties.gettpsUrl(); @@ -317,7 +318,7 @@ public class MeituanServiceImpl implements IMeituanService { try { countDownLatch.await(); //保证之前的所有的线程都执行完成，才会走下面的； long endTime = System.currentTimeMillis(); //结束时间 - log.error(("一共耗时time: " + (endTime - startTime) / 1000 + " s")); + log.error(("拉取订单结束，一共耗时time: " + (endTime - startTime) / 1000 + " s")); // 这样就可以在下面拿到所有线程执行完的集合结果 } catch (Exception e) { log.error("阻塞异常:"+e.getMessage()); diff --git a/ruoyi-ui/src/views/agent/list/index.vue b/ruoyi-ui/src/views/agent/list/index.vue index a09d467..174efe2 100644 --- a/ruoyi-ui/src/views/agent/list/index.vue +++ b/ruoyi-ui/src/views/agent/list/index.vue @@ -78,7 +78,12 @@ - + + + +