From 1901fceb6ddaa56a57f3131191454554c3e77e68 Mon Sep 17 00:00:00 2001
From: guohongjin <guohongjin@test.com>
Date: 星期三, 01 五月 2024 13:56:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PsychologicalCounseling
---
rest/src/main/java/cn/stylefeng/rest/modular/user/controller/MyMentalTestController.java | 15 ++-------------
1 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/MyMentalTestController.java b/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/MyMentalTestController.java
index b3078d5..a824941 100644
--- a/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/MyMentalTestController.java
+++ b/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/MyMentalTestController.java
@@ -9,7 +9,6 @@
import cn.stylefeng.guns.modular.business.dto.MentalTestMyTestTopicDTO;
import cn.stylefeng.guns.modular.business.dto.MentalTestTopicAndRecordDTO;
import cn.stylefeng.guns.modular.business.entity.MentalTestRecord;
-import cn.stylefeng.guns.modular.business.entity.MentalTestResult;
import cn.stylefeng.guns.modular.business.entity.MentalTestTopic;
import cn.stylefeng.guns.modular.business.entity.OrderMentalTest;
import cn.stylefeng.guns.modular.business.service.*;
@@ -106,26 +105,16 @@
}
List<Long> topicIdList = list.stream().map(o -> o.getTopicId()).collect(Collectors.toList());
- List<MentalTestResult> mentalTestResultAll = mentalTestResultService.list(
- Wrappers.<MentalTestResult>lambdaQuery()
- .eq(MentalTestResult::getUserId, userId)
- .in(MentalTestResult::getTopicId, topicIdList)
- .groupBy(MentalTestResult::getTopicId)
- );
List<OrderMentalTest> orderMentalTestAll = orderMentalTestService.list(
Wrappers.<OrderMentalTest>lambdaQuery()
.eq(OrderMentalTest::getUserId, userId)
.eq(OrderMentalTest::getStatusFlag, OrderStatusFlagEnum.PAY_SUCCESS.getCode())
.in(OrderMentalTest::getGoodsId, topicIdList)
- .groupBy(OrderMentalTest::getGoodsId)
);
return new SuccessResponseData(list.stream().map(o -> {
- // 是否测试
- o.setTestFlag(mentalTestResultAll.stream().filter(oo -> oo.getTopicId().equals(o.getTopicId())).findFirst().isPresent());
-
- // 是否购买
- o.setPayFlag(orderMentalTestAll.stream().filter(oo -> oo.getGoodsId().equals(o.getTopicId())).findFirst().isPresent());
+ // 是否后台创建
+ o.setIsBack(orderMentalTestAll.stream().filter(oo -> oo.getOrderNo().equals(o.getOrderNo()) && oo.getIsBack()).findFirst().map(OrderMentalTest::getIsBack).orElse(false));
return o;
}).collect(Collectors.toList()));
--
Gitblit v1.7.1