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 ++++++++++++++
roses/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/service/impl/CustomerServiceImpl.java | 4 ++--
guns/src/main/java/cn/stylefeng/guns/modular/business/controller/StatMentalTestController.java | 1 +
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/guns/src/main/java/cn/stylefeng/guns/modular/business/controller/StatMentalTestController.java b/guns/src/main/java/cn/stylefeng/guns/modular/business/controller/StatMentalTestController.java
index 8fcc877..e251412 100644
--- a/guns/src/main/java/cn/stylefeng/guns/modular/business/controller/StatMentalTestController.java
+++ b/guns/src/main/java/cn/stylefeng/guns/modular/business/controller/StatMentalTestController.java
@@ -146,6 +146,7 @@
long userBuyCount = orderConsultOneService.list(
Wrappers.<OrderConsultOne>lambdaQuery()
.select(OrderConsultOne::getUserId)
+ .eq(workerId != null, OrderConsultOne::getGoodsId, workerId)
.in(OrderConsultOne::getStatusFlag, statusFlagList)
.ge(StrUtil.isNotBlank(beginTime), OrderConsultOne::getCreateTime, beginTime)
.le(StrUtil.isNotBlank(endTime), OrderConsultOne::getCreateTime, endTime)
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, "心理测试记录不存在");
diff --git a/roses/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/service/impl/CustomerServiceImpl.java b/roses/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/service/impl/CustomerServiceImpl.java
index 90f867c..5527398 100644
--- a/roses/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/service/impl/CustomerServiceImpl.java
+++ b/roses/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/service/impl/CustomerServiceImpl.java
@@ -219,9 +219,9 @@
sessionManagerApi.createSession(jwtToken, loginUser, loginRequest.getCreateCookie());
// 如果开启了单账号单端在线，则踢掉已经上线的该用户
- if (AuthConfigExpander.getSingleAccountLoginFlag()) {
+// if (AuthConfigExpander.getSingleAccountLoginFlag()) {
sessionManagerApi.removeSessionExcludeToken(jwtToken);
- }
+// }
}
// 更新用户ip和登录时间
--
Gitblit v1.7.1