From 67c5f30d9a0d96746a423fbaf4c843593801a28a Mon Sep 17 00:00:00 2001 From: guohongjin <guohongjin@test.com> Date: 星期三, 17 四月 2024 16:24:02 +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/order/service/MentalTestOrderBizService.java | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/order/service/MentalTestOrderBizService.java b/rest/src/main/java/cn/stylefeng/rest/modular/order/service/MentalTestOrderBizService.java index 513521e..c67a4e6 100644 --- a/rest/src/main/java/cn/stylefeng/rest/modular/order/service/MentalTestOrderBizService.java +++ b/rest/src/main/java/cn/stylefeng/rest/modular/order/service/MentalTestOrderBizService.java @@ -102,6 +102,20 @@ @Transactional(rollbackFor = Exception.class) public OrderConsultOne createOrderConsultOne(CreateOrderConsultOneRequest req) { + // 生成了订单但未支付 + OrderConsultOne oo = orderConsultOneService.getOne( + Wrappers.<OrderConsultOne>lambdaQuery() + .eq(OrderConsultOne::getUserId, req.getUserId()) + .eq(OrderConsultOne::getMentalTestRecordId, req.getMentalTestRecordId()) + .eq(OrderConsultOne::getStatusFlag, OrderStatusFlagEnum.WAIT_PAY.getCode()) + .eq(OrderConsultOne::getIsDelete, YesOrNotEnum.N.getCode()) + .last("LIMIT 1") + ); + if (oo != null) { + // 可以提示用户 + return oo; + } + // 心理测试记录 MentalTestRecord mentalTestRecord = mentalTestRecordService.getById(req.getMentalTestRecordId()); Assert.notNull(mentalTestRecord, "心理测试记录不存在"); -- Gitblit v1.7.1