From 6bf1204632096ea479ba67521a08ece2e767af76 Mon Sep 17 00:00:00 2001 From: wangshuai Date: Sun, 28 Jul 2024 23:43:44 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=9B=E7=AE=97=E6=B3=95=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E8=8E=B7=E5=8F=96=E6=89=8B=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?403=202=EF=BC=9B=E8=A1=A8=E6=A0=BC=E6=95=B0=E6=8D=AE=E9=A1=B5?= =?UTF-8?q?=E7=A9=BA=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusStoreDayHistoryInfoController.java | 19 ++++----- .../controller/MeituanController.java | 5 ++- .../business/service/IMeituanService.java | 2 +- .../service/impl/MeituanServiceImpl.java | 40 +++++++++++-------- 4 files changed, 38 insertions(+), 28 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreDayHistoryInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreDayHistoryInfoController.java index 96ca371..896bd45 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreDayHistoryInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreDayHistoryInfoController.java @@ -77,6 +77,10 @@ public class BusStoreDayHistoryInfoController extends BaseController if (storeInfo != null) { int totalComments = 0; BigDecimal totamMoney = new BigDecimal("0"); + BigDecimal d = new BigDecimal("0"); + if (storeInfo.getPrice() != null){ + d = storeInfo.getPrice(); + } while (dateFormat.parse(startTime).getTime() <= dateFormat.parse(expEndTime).getTime()){ BusStoreExcelInfo excelInfo = new BusStoreExcelInfo(); excelInfo.setOrderDate(startTime); @@ -92,18 +96,15 @@ public class BusStoreDayHistoryInfoController extends BaseController if (data != null){ excelInfo.setCommentsNumber(data.getLastPositiveReviewsNum()); totalComments += data.getLastPositiveReviewsNum(); + excelInfo.setPrice(d.toString()); + BigDecimal money = d.multiply(new BigDecimal(data.getLastPositiveReviewsNum())); + excelInfo.setMoney(money.toString()); + totamMoney = totamMoney.add(money); }else{ excelInfo.setCommentsNumber(0); + excelInfo.setPrice(d.toString()); + excelInfo.setMoney("0"); } - BigDecimal d = new BigDecimal("0"); - if (storeInfo.getPrice() != null){ - d = storeInfo.getPrice(); - } - excelInfo.setPrice(d.toString()); - BigDecimal money = d.multiply(new BigDecimal(data.getLastPositiveReviewsNum())); - excelInfo.setMoney(money.toString()); - totamMoney = totamMoney.add(money); - list.add(excelInfo); Calendar calendar = Calendar.getInstance(); 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 452bc2e..d176fc4 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 @@ -120,9 +120,10 @@ public class MeituanController { iMeituanService.priPhoneInfo(list, cookie); } + @ApiOperation("getMtgsig") @GetMapping("/getMtgsig") - public String mtgsig(String orderId,String regionId,String regionVersion) { - return iMeituanService.mtgsigInfo(orderId,regionId,regionVersion); + public String mtgsig(String orderId,String regionId,String regionVersion,String dfpid) { + return iMeituanService.mtgsigInfo(orderId,regionId,regionVersion,dfpid); } 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 1f541c2..165c7b0 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 @@ -51,7 +51,7 @@ public interface IMeituanService { * @param regionVersion * @return */ - String mtgsigInfo(String orderId,String regionId,String regionVersion); + String mtgsigInfo(String orderId,String regionId,String regionVersion,String dfpid); String getStoreName(String cookie); 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 402b2d4..3a77998 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 @@ -451,6 +451,9 @@ public class MeituanServiceImpl implements IMeituanService { if (completeTime.contains("约今日")){ completeTime = completeTime.replaceAll("约今日 ",""); } + if (completeTime.contains("明日")){ + completeTime = completeTime.replaceAll("明日 ",""); + } orderInfo.setCompleteTime(completeTime); orderInfo.setOrderStatus(statusDesc); @@ -523,7 +526,7 @@ public class MeituanServiceImpl implements IMeituanService { params.put("yodaReady", "h5"); params.put("csecplatform", 4); params.put("csecversion", "2.4.0"); - params.put("mtgsig", mtgsigInfo(wmOrderViewId,valueFromCookie("region_id", cookie),valueFromCookie("region_version", cookie))); + params.put("mtgsig", mtgsigInfo(wmOrderViewId,valueFromCookie("region_id", cookie),valueFromCookie("region_version", cookie),valueFromCookie("WEBDFPID",cookie))); url = appendParams(url, params); HttpGet request = new HttpGet(url); request.setHeader("Cookie",cookie); @@ -552,7 +555,7 @@ public class MeituanServiceImpl implements IMeituanService { params.put("yodaReady", "h5"); params.put("csecplatform", 4); params.put("csecversion", "2.4.0"); - params.put("mtgsig", mtgsigInfo("",valueFromCookie("region_id", cookie),valueFromCookie("region_version", cookie))); + params.put("mtgsig", mtgsigInfo("",valueFromCookie("region_id", cookie),valueFromCookie("region_version", cookie),valueFromCookie("WEBDFPID",cookie))); url = appendParams(url, params); MultipartEntityBuilder builder = MultipartEntityBuilder.create(); @@ -672,11 +675,13 @@ public class MeituanServiceImpl implements IMeituanService { params.put("yodaReady", "h5"); params.put("csecplatform", 4); params.put("csecversion", "2.4.0"); - String mtgsig = mtgsigInfo(orderInfo.getOrderNo(), regionId, regionVersion); + String mtgsig = mtgsigInfo(orderInfo.getOrderNo(), regionId, regionVersion,valueFromCookie("WEBDFPID",cookie)); + System.out.println(mtgsig); + System.out.println(orderInfo.toString()); params.put("mtgsig", mtgsig); url = appendParams(url, params); MultipartEntityBuilder builder = MultipartEntityBuilder.create(); -// builder.addTextBody("searchItem","3801144621770927987"); + builder.addTextBody("wmPoiId",orderInfo.getStoreCode()); HttpPost httpPost = new HttpPost(url); HttpEntity entity = builder.build(); httpPost.setEntity(entity); @@ -684,16 +689,18 @@ public class MeituanServiceImpl implements IMeituanService { CloseableHttpClient client = proxyHttpClient(); - String resp = null; + String code = null; + JSONObject jsonObject = new JSONObject(); try { HttpResponse response = client.execute(httpPost); HttpEntity responseEntity = response.getEntity(); - resp = EntityUtils.toString(responseEntity); + String resp = EntityUtils.toString(responseEntity); + jsonObject = JSONObject.parseObject(resp); + code = jsonObject.getString(("code")); } catch (Exception e) { e.printStackTrace(); + continue; } - JSONObject jsonObject = JSONObject.parseObject(resp); - String code = jsonObject.getString(("code")); if ("0".equals(code)) { JSONArray array = jsonObject.getJSONArray("wmOrderList"); @@ -759,7 +766,7 @@ public class MeituanServiceImpl implements IMeituanService { */ @Override @Transactional(rollbackFor = Exception.class) - public String mtgsigInfo(String orderId, String regionId, String regionVersion) { + public String mtgsigInfo(String orderId, String regionId, String regionVersion,String dfpid) { CloseableHttpClient httpClient = proxyHttpClient(); String url = "http://43.140.224.18:12000/get_mtgsig"; HttpPost httpPost = new HttpPost(url); @@ -767,15 +774,16 @@ public class MeituanServiceImpl implements IMeituanService { Map subUrlParams = new LinkedHashMap<>(); subUrlParams.put("url", "https://e.waimai.meituan.com/v2/order/history/r/search/ajax?"); - subUrlParams.put("searchItem", orderId); - subUrlParams.put("region_id", regionId); - subUrlParams.put("region_version", regionVersion); - subUrlParams.put("yodaReady", "h5"); - subUrlParams.put("csecplatform", 4); - subUrlParams.put("csecversion", "2.4.0"); +// subUrlParams.put("searchItem", orderId); +// subUrlParams.put("region_id", regionId); +// subUrlParams.put("region_version", regionVersion); +// subUrlParams.put("yodaReady", "h5"); +// subUrlParams.put("csecplatform", 4); +// subUrlParams.put("csecversion", "2.4.0"); subUrlParams.put("data", ""); - subUrlParams.put("dfpid", "x528894270u555uvyz734vu21zz348v08095w0y4y68979584766w00y"); + subUrlParams.put("dfpid", dfpid.split("-")[0]); + subUrlParams.put("method", "post"); String urlParam = ""; for (Map.Entry stringObjectEntry : subUrlParams.entrySet()) {