java/PsychologicalCounseling.git

			@@ -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)

			@@ -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, "心理测试记录不存在");

			@@ -219,9 +219,9 @@
			sessionManagerApi.createSession(jwtToken, loginUser, loginRequest.getCreateCookie());

			// 如果开启了单账号单端在线，则踢掉已经上线的该用户
			if (AuthConfigExpander.getSingleAccountLoginFlag()) {
			// if (AuthConfigExpander.getSingleAccountLoginFlag()) {
			sessionManagerApi.removeSessionExcludeToken(jwtToken);
			}
			// }
			}

			// 更新用户ip和登录时间

	guns/src/main/java/cn/stylefeng/guns/modular/business/controller/StatMentalTestController.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	rest/src/main/java/cn/stylefeng/rest/modular/order/service/MentalTestOrderBizService.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	roses/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/service/impl/CustomerServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史