From 34cffd2b0d1d28654a7644ff4f7fdb5ddaaf62d4 Mon Sep 17 00:00:00 2001 From: wangshuai Date: Tue, 23 Jul 2024 18:58:25 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=9B=E6=9D=83=E9=99=90=202=EF=BC=9Beleme?= =?UTF-8?q?=E5=9B=9E=E8=B0=83url=203=EF=BC=9B=E5=BA=97=E9=93=BA=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=90=8E=E4=B9=9F=E8=83=BD=E6=9F=A5=E7=9C=8B=E8=90=A5?= =?UTF-8?q?=E9=94=80=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/business/controller/BusTemplateInfoController.java | 2 +- .../java/com/ruoyi/business/controller/ElemeController.java | 4 +--- .../business/service/impl/BusReturnVisitInfoServiceImpl.java | 2 +- .../com/ruoyi/business/service/impl/MeituanServiceImpl.java | 5 +++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusTemplateInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusTemplateInfoController.java index cb4932b..6691a41 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusTemplateInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusTemplateInfoController.java @@ -128,7 +128,7 @@ public class BusTemplateInfoController extends BaseController /** * 删除模版 */ - @PreAuthorize("@ss.hasPermi('business:template:remove')") +// @PreAuthorize("@ss.hasPermi('business:template:remove')") @Log(title = "模版", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/ElemeController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/ElemeController.java index 5b746bb..9add70a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/ElemeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/ElemeController.java @@ -1,7 +1,5 @@ package com.ruoyi.business.controller; -import org.springframework.scheduling.annotation.Async; -import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -13,7 +11,7 @@ public class ElemeController { @GetMapping("/message_receive") public String msg() { - return "{\"message\":\"ok\"}"; + return "{\"code\":\"200\",\"message\":\"ok\"}"; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusReturnVisitInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusReturnVisitInfoServiceImpl.java index 8670983..13b5e7f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusReturnVisitInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusReturnVisitInfoServiceImpl.java @@ -63,7 +63,7 @@ public class BusReturnVisitInfoServiceImpl implements IBusReturnVisitInfoService }else{ info.setBindId(SecurityUtils.getLoginUser().getUserId()); } - List list = storeInfoMapper.selectBusStoreInfoList(info); + List list = storeInfoMapper.selectBusStoreInfoListA(info); if (list.size() != 0) { List sl = new ArrayList<>(); for (BusStoreInfo storeInfo : list) { 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 5f5cf76..e731f3b 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 @@ -380,8 +380,8 @@ public class MeituanServiceImpl implements IMeituanService { for (int i = 0; i < array.size(); i++) { BusOrderInfo orderInfo = new BusOrderInfo(); Object o = array.get(i); + JSONObject oj = JSONObject.parseObject(JSON.toJSONString(o)); try { - JSONObject oj = JSONObject.parseObject(JSON.toJSONString(o)); String isPhf = oj.getString("businessType"); JSONObject order0 = oj.getJSONObject("orderInfo"); JSONObject commonInfo = oj.getJSONObject("commonInfo"); @@ -441,7 +441,8 @@ public class MeituanServiceImpl implements IMeituanService { } orderInfo.setIsPhf(isPhf); }catch (Exception e){ - System.out.println(e.getMessage()); + System.out.println(wmPoiId+" "+oj.toJSONString()); + e.printStackTrace(); continue; } list.add(orderInfo);