From 5e84bb72390253f85f2dbd9f0739987974e6ab17 Mon Sep 17 00:00:00 2001 From: wangshuai Date: Sun, 28 Jul 2024 12:27:44 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=9B=E8=8E=B7=E5=8F=96=E5=BA=97=E9=93=BA?= =?UTF-8?q?=E5=90=8D=E5=A4=87=E7=94=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/controller/MeituanController.java | 17 +++++++++++++++++ .../ruoyi/business/service/IMeituanService.java | 3 +++ .../service/impl/MeituanServiceImpl.java | 6 +++--- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/MeituanController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/MeituanController.java index c7e6406..452bc2e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/MeituanController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/MeituanController.java @@ -9,6 +9,9 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.EnableAsync; @@ -21,6 +24,7 @@ import java.util.List; /** * 采集美团接口 */ +@Api(tags = "mt") @RestController @RequestMapping("/mt") @EnableAsync @@ -91,6 +95,19 @@ public class MeituanController { return iMeituanService.orderInfo(poiId, d, ck); } + /** + * 获取订单 + * @return + */ + @ApiOperation("getStoreName") + @GetMapping("/getStoreName") + public R getStoreName(String cookie) { + String name = iMeituanService.getStoreName(cookie); + if(StringUtils.isEmpty(name)){ + name = iMeituanService.getStoreNameApi(cookie); + } + return R.ok(name); + } /** * 获取号码 diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/IMeituanService.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/IMeituanService.java index 561478c..1f541c2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/IMeituanService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/IMeituanService.java @@ -52,8 +52,11 @@ public interface IMeituanService { * @return */ String mtgsigInfo(String orderId,String regionId,String regionVersion); + String getStoreName(String cookie); + String getStoreNameApi(String cookie); + void getReturnInfo(Long id); String getComment(Long id); 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 8fa2c78..f2a2bfe 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 @@ -619,12 +619,13 @@ public class MeituanServiceImpl implements IMeituanService { return null; } + @Override public String getStoreNameApi(String cookie){ String url = "https://e.waimai.meituan.com/api/v2/account/homePage"; Map params = new LinkedHashMap<>(); - params.put("acctId", valueFromCookie("acctId", cookie)); params.put("region_id", valueFromCookie("region_id", cookie)); params.put("region_version", valueFromCookie("region_version", cookie)); + params.put("acctId", valueFromCookie("acctId", cookie)); params.put("yodaReady", "h5"); params.put("csecplatform", 4); params.put("csecversion", "2.4.0"); @@ -644,8 +645,7 @@ public class MeituanServiceImpl implements IMeituanService { String code = jsonObject.getString(("code")); if ("0".equals(code)) { JSONObject data = jsonObject.getJSONObject("data"); - JSONObject wmPoiData = data.getJSONObject("wmPoiData"); - String wmPoiName = wmPoiData.getString("wmPoiName"); + String wmPoiName = data.getString("wmPoiName"); return wmPoiName; } }