From 222bb33db2578be831918eb8005aa2af758ecf54 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Mon, 7 Aug 2023 11:35:28 +0800
Subject: [PATCH] 2023-08-07

---
 .../supervise/report/biz/wechat/WechatRest.java   | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java
index d22da9e9..7abc856b 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java
@@ -12,6 +12,8 @@ import com.yxt.supervise.report.api.reportinventorydaygather.ReportInventoryDayG
 import com.yxt.supervise.report.api.wechat.Template;
 import com.yxt.supervise.report.biz.csmcashreport.CsmCashReportMapper;
 import com.yxt.supervise.report.biz.messagepushlog.MessagePushLogService;
+import com.yxt.supervise.report.biz.projectdaily.ProjectDaily;
+import com.yxt.supervise.report.biz.projectdaily.ProjectDailyService;
 import com.yxt.supervise.report.biz.reportinventory.ReportInventoryDayGatherMapper;
 import com.yxt.supervise.report.biz.stock.ReportStockDay;
 import com.yxt.supervise.report.biz.stock.StockDayRest;
@@ -72,6 +74,8 @@ public class WechatRest {
     com.yxt.supervise.report.ds.system.systemMapper systemMapper;
     @Autowired
     CrmMapper crmMapper;
+    @Autowired
+    ProjectDailyService projectDailyService;
     @ApiOperation("token")
     @GetMapping(value = "token")
     public String wechate(String signature,String timestamp,String nonce,String echostr){
@@ -342,7 +346,8 @@ public class WechatRest {
             String id=systemMapper.getOpenId(u);
             openIds.add(id);
         }
-        ReportStockDay reportStockDay=stockDayRest.getDayGather(projectSid,orderDate).getData();
+
+        ProjectDaily projectDaily=projectDailyService.fetchByProjectAndDay(projectSid,orderDate);
         // 模板参数
         Map<String, Template> sendMag = new HashMap<String, Template>();
         // 公众号的模板id(也有相应的接口可以查询到)
@@ -357,12 +362,12 @@ public class WechatRest {
             MessageOpenidDto dto=new MessageOpenidDto();
             dto.setOpenId(openId);
             list.add(dto);
-            sendMag.put("time1", new Template(reportStockDay.getReportTime()));
-            sendMag.put("thing2", new Template("监管数据总览("+reportStockDay.getProjectName()+")"));
+            sendMag.put("time1", new Template(projectDaily.getReportTime()));
+            sendMag.put("thing2", new Template("监管数据总览("+projectDaily.getProjectName()+")"));
             sendMag.put("thing3", new Template("赵丽晓"));
             Map<String, String> miniprogram = new HashMap<>();
             miniprogram.put("appid","wx05604ce2a8bede05");
-            miniprogram.put("pagepath","pages/index/RegulatoryReporting?orderDate="+reportStockDay.getOrderDate()+"&"+"projectSid="+reportStockDay.getProjectSid());
+            miniprogram.put("pagepath","pages/index/RegulatoryReporting?orderDate="+projectDaily.getOrderDate()+"&"+"projectSid="+projectDaily.getProjectSid());
             pa=miniprogram.get("pagepath");
             RestTemplate restTemplate = new RestTemplate();
             //拼接base参数
@@ -384,7 +389,7 @@ public class WechatRest {
         //推送消息之后保存消息日志
         MessagePushLogDto logDto=new MessagePushLogDto();
         logDto.setContent(sendMag);
-        logDto.setMessageTime(reportStockDay.getReportTime());
+        logDto.setMessageTime(projectDaily.getReportTime());
         logDto.setPagepath(pa);
         logDto.setMessageOpenidDtos(list);
         ThreadUtil.execute(() -> {