From 414c3baefcac09eaa30e70caf5ddb6423f8e2c20 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 10 五月 2023 11:00:56 +0800
Subject: [PATCH] DEMO初步完成
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerMemberTaskPageDto.java | 3 +++
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskMapper.xml | 5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerMemberTaskPageDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerMemberTaskPageDto.java
index 3069d90..1738ec6 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerMemberTaskPageDto.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerMemberTaskPageDto.java
@@ -16,4 +16,7 @@
@ApiModelProperty(name = "会员用户id")
private Long memberUserId;
+
+ @ApiModelProperty(name = "今日",hidden = true)
+ private String today;
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskMapper.xml
index cb59c00..630908a 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskMapper.xml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskMapper.xml
@@ -83,9 +83,10 @@
SELECT
task_id taskId,
task_date taskDate,
- task_content taskContent
+ task_content taskContent,
+ CASE WHEN task_date = #{param.today} THEN 1 ELSE 0 END todayFlag
FROM t_member_task
WHERE del_flag = 0 AND shop_id = #{param.shopId} AND user_id = #{param.memberUserId}
- ORDER BY task_date DESC
+ ORDER BY todayFlag,task_date DESC
</select>
</mapper>
--
Gitblit v1.7.1