From 2cc628c7ba7a3d9d7c3a5b13bcbd03eb0ec7d771 Mon Sep 17 00:00:00 2001
From: zhangjinli <zhangjinli_808@163.com>
Date: Fri, 1 Jul 2022 16:40:46 +0800
Subject: [PATCH] zh

---
 .../controller/manage/VideoController.java    | 30 ++++++++++++-------
 .../wxApp/AppMessageController.java           |  3 +-
 .../controller/wxApp/VideoUController.java    |  7 +++--
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/zh/project0512/controller/manage/VideoController.java b/src/main/java/com/zh/project0512/controller/manage/VideoController.java
index 81087f9..c78c6e8 100644
--- a/src/main/java/com/zh/project0512/controller/manage/VideoController.java
+++ b/src/main/java/com/zh/project0512/controller/manage/VideoController.java
@@ -136,10 +136,14 @@ public class VideoController {
     public Result valid(@Validated @RequestBody VVParam param) {
         int id = param.getId();
         Video video = videoService.getById(id);
-        if(null == video){
+        if (null == video) {
             return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "未找到该视频");
         }
         Integer originEffectResult = video.getEffectResult() == null ? 0 : video.getEffectResult();
+        String touser = userService.getById(video.getUserId()).getUserid();
+        AppMessage appMessage = new AppMessage().setTitle("传播效果审核结果")
+            .setUrl("pages/quest/subpage/detail/detail?id=" + video.getTaskId())
+            .setReceiverId(video.getUserId());
         if (param.getStatus() == 3) {
             String reason = param.getReason();
             if (reason == null) {
@@ -151,8 +155,16 @@ public class VideoController {
             if (!op) {
                 return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "无效操作");
             }
-            AppMessageUtil.sendMessage(new AppMessage().setTitle("传播效果审核结果").setDescription("您的抖音传播效果审核未通过，未通过原因：" + param.getReason() + "。")
-                .setUrl("pages/quest/subpage/detail/detail?id=" + video.getTaskId()).setReceiverId(video.getUserId()));
+            appMessage.setDescription("您的抖音传播效果审核未通过，未通过原因：" + param.getReason() + "。");
+            // 企业微信消息通知
+            if (touser != null) {
+                appMessage.setTouser(touser);
+                List<JSONObject> content_item = new ArrayList<>();
+                content_item.add(new JSONObject().fluentPut("key", "审核结果").fluentPut("value", appMessage.getDescription()));
+                content_item.add(new JSONObject().fluentPut("key", "审核时间").fluentPut("value", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
+                httpUtil.qywxMessage(httpUtil.qywxGetToken(), touser, "传播效果审核", null, appMessage.getUrl(), content_item);
+            }
+            AppMessageUtil.sendMessage(appMessage);
             return Result.success("", "审核拒绝完成");
         }
         UpdateWrapper<Video> up = new UpdateWrapper<>();
@@ -188,18 +200,14 @@ public class VideoController {
                 break;
             default:
         }
-        AppMessage appMessage = new AppMessage().setTitle("传播效果审核结果")
-            .setDescription("恭喜您，" + platForm + "传播效果审核通过，平台评定传播值为" + effectResult + "。")
-            .setUrl("pages/quest/subpage/detail/detail?id=" + video.getTaskId())
-            .setReceiverId(video.getUserId());
+        appMessage.setDescription("恭喜您，" + platForm + "传播效果审核通过，平台评定传播值为" + effectResult + "。");
         // 企业微信消息通知
-        String touser = userService.getById(video.getUserId()).getUserid();
         if (touser != null) {
             appMessage.setTouser(touser);
             List<JSONObject> content_item = new ArrayList<>();
-            content_item.add(new JSONObject().fluentPut("key","审核结果").fluentPut("value",appMessage.getDescription()));
-            content_item.add(new JSONObject().fluentPut("key","审核时间").fluentPut("value",LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
-            httpUtil.qywxMessage(httpUtil.qywxGetToken(),touser,"传播效果审核",null,appMessage.getUrl(),content_item);
+            content_item.add(new JSONObject().fluentPut("key", "审核结果").fluentPut("value", appMessage.getDescription()));
+            content_item.add(new JSONObject().fluentPut("key", "审核时间").fluentPut("value", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
+            httpUtil.qywxMessage(httpUtil.qywxGetToken(), touser, "传播效果审核", null, appMessage.getUrl(), content_item);
         }
         AppMessageUtil.sendMessage(appMessage);
         return Result.success("", "审核完成");
diff --git a/src/main/java/com/zh/project0512/controller/wxApp/AppMessageController.java b/src/main/java/com/zh/project0512/controller/wxApp/AppMessageController.java
index 796ff1a..845d565 100644
--- a/src/main/java/com/zh/project0512/controller/wxApp/AppMessageController.java
+++ b/src/main/java/com/zh/project0512/controller/wxApp/AppMessageController.java
@@ -48,7 +48,8 @@ public class AppMessageController {
         User user = userService.selByOpenid(openid);
         QueryWrapper<AppMessage> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("receiverId", user.getId());
-        queryWrapper.orderByDesc("settled","createDate");
+        queryWrapper.orderByAsc("settled");
+        queryWrapper.orderByDesc("createDate");
         return Result.success(appMessageService.page(MybatisPlusUtil.SetPage(obj), queryWrapper), "请求成功");
     }
 
diff --git a/src/main/java/com/zh/project0512/controller/wxApp/VideoUController.java b/src/main/java/com/zh/project0512/controller/wxApp/VideoUController.java
index 760873c..8b6334f 100644
--- a/src/main/java/com/zh/project0512/controller/wxApp/VideoUController.java
+++ b/src/main/java/com/zh/project0512/controller/wxApp/VideoUController.java
@@ -67,6 +67,7 @@ public class VideoUController {
     @TokenValid
     public Result userAdd(@Validated @RequestBody UserAddParam param, @RequestHeader("token") @Parameter(name = "登录token") String token) {
         Claims claims = new JwtUtil().parseJWT(token);
+        Integer taskId = param.getId();
         Integer useId = userService.selByOpenid(claims.getId()).getId();
 //        校验用户和用户账号
         if (useId == null) {
@@ -79,7 +80,7 @@ public class VideoUController {
             return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "账号不可用");
         }
 //        校验任务状态
-        Integer taskStatus = userTaskService.userTaskStatus(useId, param.getId());
+        Integer taskStatus = userTaskService.userTaskStatus(useId,taskId);
         if (taskStatus == null) {
             return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "用户未接受任务");
         } else if (taskStatus == 0) {
@@ -89,12 +90,12 @@ public class VideoUController {
         }
         // 不支持重复提交
         QueryWrapper<Video> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("userId",useId).eq("type",param.getType());
+        queryWrapper.eq("userId",useId).eq("taskId",taskId).eq("type",param.getType());
         if(videoService.getMap(queryWrapper)!=null){
             return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "已提交过该平台视频");
         }
 
-        videoService.save(new Video().setUserId(useId).setTaskId(param.getId()).setType(param.getType()).setUrl(param.getUrl()).setCreatAt(LocalDateTime.now()).setUpdateAt(LocalDateTime.now()));
+        videoService.save(new Video().setUserId(useId).setTaskId(taskId).setType(param.getType()).setUrl(param.getUrl()).setCreatAt(LocalDateTime.now()).setUpdateAt(LocalDateTime.now()));
         return Result.success("添加完成！");
     }