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/order/controller/MentalTestOrderController.java | 45 +++++++++++++++++++--------------------------
1 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/order/controller/MentalTestOrderController.java b/rest/src/main/java/cn/stylefeng/rest/modular/order/controller/MentalTestOrderController.java
index 58f62e8..fdb88b0 100644
--- a/rest/src/main/java/cn/stylefeng/rest/modular/order/controller/MentalTestOrderController.java
+++ b/rest/src/main/java/cn/stylefeng/rest/modular/order/controller/MentalTestOrderController.java
@@ -1,17 +1,18 @@
package cn.stylefeng.rest.modular.order.controller;
-import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;
import cn.stylefeng.guns.modular.business.dto.request.CreateOrderConsultOneRequest;
import cn.stylefeng.guns.modular.business.dto.request.CreateOrderMentalTestRequest;
-import cn.stylefeng.guns.modular.business.entity.*;
-import cn.stylefeng.guns.modular.business.service.*;
+import cn.stylefeng.guns.modular.business.entity.MentalAnalysisTime;
+import cn.stylefeng.guns.modular.business.entity.MentalAppointment;
+import cn.stylefeng.guns.modular.business.entity.OrderConsultOne;
+import cn.stylefeng.guns.modular.business.entity.OrderMentalTest;
+import cn.stylefeng.guns.modular.business.service.IMentalAnalysisTimeService;
+import cn.stylefeng.guns.modular.business.service.IMentalAppointmentService;
+import cn.stylefeng.guns.modular.business.service.IOrderConsultOneService;
+import cn.stylefeng.guns.modular.business.service.IOrderMentalTestService;
import cn.stylefeng.rest.modular.order.service.MentalTestOrderBizService;
-import cn.stylefeng.roses.kernel.auth.api.context.LoginContext;
-import cn.stylefeng.roses.kernel.auth.api.pojo.login.LoginUser;
-import cn.stylefeng.roses.kernel.customer.modular.entity.Customer;
-import cn.stylefeng.roses.kernel.customer.modular.service.CustomerService;
import cn.stylefeng.roses.kernel.rule.pojo.request.BaseIdRequest;
import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
@@ -27,11 +28,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
import java.util.List;
-import java.util.stream.Collectors;
@Slf4j
@Api(tags = "心理测试接口")
@@ -62,8 +59,16 @@
return new SuccessResponseData(o);
}
- @Resource
- private IMentalAnalysisTimeConfigService mentalAnalysisTimeConfigService;
+ @ApiOperation(value = "心理测试订单详情")
+ @PostResource(name = "心理测试订单详情", path = "/orderMentalTestDetail")
+ public ResponseData<OrderMentalTest> orderMentalTestDetail(Long id, String orderNo) {
+ OrderMentalTest o = orderMentalTestService.getOne(
+ Wrappers.<OrderMentalTest>lambdaQuery()
+ .eq(id != null, OrderMentalTest::getId, id)
+ .eq(StrUtil.isNotEmpty(orderNo), OrderMentalTest::getOrderNo, orderNo)
+ );
+ return new SuccessResponseData(o);
+ }
@ApiOperation(value = "1V1咨询可预约时间")
@GetResource(name = "1V1咨询可预约时间", path = "/mentalAnalysisTime")
@@ -89,24 +94,12 @@
// }
}
- @Resource
- private CustomerService customerService;
-
@ApiOperation(value = "1V1咨询预约性格分析下单")
@PostResource(name = "1V1咨询预约性格分析下单", path = "/createOrderConsultOne")
- public ResponseData<OrderConsultOne> createOrderConsultOne(@RequestBody CreateOrderConsultOneRequest req) {
+ public synchronized ResponseData<OrderConsultOne> createOrderConsultOne(@RequestBody CreateOrderConsultOneRequest req) {
Assert.isTrue(StrUtil.isNotBlank(req.getRealName()), "姓名不能为空");
Assert.isTrue(StrUtil.isNotBlank(req.getLinkPhone()), "联系电话不能为空");
OrderConsultOne o = mentalTestOrderBizService.createOrderConsultOne(req);
- try {
- Customer customer = new Customer();
- BeanUtil.copyProperties(req, customer);
- LoginUser loginUser = LoginContext.me().getLoginUser();
- customer.setCustomerId(loginUser.getUserId());
- customerService.updateById(customer);
- } catch (Exception e) {
- log.info("修改用户信息报错");
- }
return new SuccessResponseData(o);
}
--
Gitblit v1.7.1