From af814fb1e12861d0e94170ad7bfaf0d3c7d7079b Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Thu, 5 Aug 2021 10:36:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B2=A1=E6=9C=89=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E4=B8=8D=E8=83=BD=E7=99=BB=E5=BD=95=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom/WechatAppletController.java        | 44 +++++++++----------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java
index 831ffb41f..8bf31d8a9 100644
--- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java
+++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java
@@ -444,7 +444,9 @@ public class WechatAppletController extends BaseController {
         }
 
         // 更新时间超过21天，重新登录获取最新信息
-        if (StringUtils.isEmpty(curWxUserInfo.getAvatarUrl()) || ChronoUnit.DAYS.between(DateUtils.dateToLocalDate(curWxUserInfo.getUpdateTime()), LocalDate.now()) >= 21) {
+        if (
+//                StringUtils.isEmpty(curWxUserInfo.getAvatarUrl()) ||
+                ChronoUnit.DAYS.between(DateUtils.dateToLocalDate(curWxUserInfo.getUpdateTime()), LocalDate.now()) >= 21) {
             return AjaxResult.error(5001, "信息缺失或者过期需要重新登录");
         }
 
@@ -736,7 +738,7 @@ public class WechatAppletController extends BaseController {
      *
      */
     @GetMapping("/getCustomerActivity")
-    public TableDataInfo getCustomerActivity(@RequestParam String openid){
+    public TableDataInfo getCustomerActivity(@RequestParam String openid) {
         startPage();
         return getDataTable(sysWxUserLogService.getCommunityPunchByOpenid(openid));
     }
@@ -755,7 +757,7 @@ public class WechatAppletController extends BaseController {
             rows = sysPunchThumbsupService.insertSysPunchThumbsup(sysPunchThumbsup);
             if (rows > 0) {
                 //发送点赞消息
-                SysWxUserLog sysWxUserLog = sysWxUserLogService.selectSysWxUserLogById(sysPunchThumbsup.getPunchId()+"");
+                SysWxUserLog sysWxUserLog = sysWxUserLogService.selectSysWxUserLogById(sysPunchThumbsup.getPunchId() + "");
                 sysMessageNoticeService.sendpunchDynamicThumbsUpMessage(sysWxUserLog, sysPunchThumbsup.getCusOpenid());
 
                 Map<String, Object> resultData = new HashMap<>();
@@ -911,36 +913,32 @@ public class WechatAppletController extends BaseController {
 
     /**
      * 查询消息列表
-     * @param cusId 客户ID
+     *
+     * @param cusId       客户ID
      * @param messageType 0 查询全部 1 查询打卡点评消息 2 打卡动态点赞消息 3 服务消息（食谱更新、执行反馈消息）
      * @return
      */
     @GetMapping("/getMessageNoticeData")
-    public AjaxResult getMessageNoticeList(@RequestParam("cusId")String cusId, @RequestParam(value = "messageType", required = false, defaultValue = "0")Integer messageType) {
+    public AjaxResult getMessageNoticeList(@RequestParam("cusId") String cusId, @RequestParam(value = "messageType", required = false, defaultValue = "0") Integer messageType) {
         cusId = StringUtils.isNotEmpty(cusId) ? AesUtils.decrypt(cusId) : "0";
+        startPage();
         Map<String, Object> result = new HashMap<>();
+//        List<Map<String, Object>> list = new ArrayList<>();
         //查询打卡消息
-        if(messageType.intValue() == 0 || messageType.intValue() == 1){
-            startPage();
-            Map<String,Object> punchResult = sysMessageNoticeService.getPunchCommentMessageByCusId(Long.parseLong(cusId));
-            List<Map<String,Object>> list = (List<Map<String,Object>>)punchResult.get("data");
-            punchResult.put("data",getDataTable(list));
-            result.put("punchMessageData", punchResult);
+        if (messageType.intValue() == 0 || messageType.intValue() == 1) {
+            result = sysMessageNoticeService.getPunchCommentMessageByCusId(Long.parseLong(cusId));
+//            list = (List<Map<String, Object>>) result.get("data");
         }
-        if(messageType.intValue() == 0 || messageType.intValue() == 2){
-            startPage();
-            Map<String,Object> thumbsUpResult = sysMessageNoticeService.getPunchDynamicThumbsUpMessage(Long.parseLong(cusId));
-            List<Map<String,Object>> list = (List<Map<String,Object>>)thumbsUpResult.get("data");
-            thumbsUpResult.put("data",getDataTable(list));
-            result.put("thumbsUpMessageData", thumbsUpResult);
+        if (messageType.intValue() == 0 || messageType.intValue() == 2) {
+            result = sysMessageNoticeService.getPunchDynamicThumbsUpMessage(Long.parseLong(cusId));
+//            list = (List<Map<String, Object>>) result.get("data");
         }
-        if(messageType.intValue() == 0 || messageType.intValue() == 3){
-            startPage();
-            Map<String,Object> serviceResult = sysMessageNoticeService.getServiceMessage(Long.parseLong(cusId));
-            List<Map<String,Object>> list = (List<Map<String,Object>>)serviceResult.get("data");
-            serviceResult.put("data",getDataTable(list));
-            result.put("serviceMessageData", serviceResult);
+        if (messageType.intValue() == 0 || messageType.intValue() == 3) {
+            result = sysMessageNoticeService.getServiceMessage(Long.parseLong(cusId));
+//            list = (List<Map<String, Object>>) result.get("data");
         }
+//        TableDataInfo tableDataInfo = getDataTable(list);
+//        result.put("total", tableDataInfo.getTotal());
         return AjaxResult.success(result);
     }
 }