From bc8bc25d9cc04168d52e3110d12e9c36b9e0cd27 Mon Sep 17 00:00:00 2001
From: goupan <goupan@chinapopin.com>
Date: 星期五, 26 四月 2024 16:27:57 +0800
Subject: [PATCH] 代码提交
---
rest/src/main/java/cn/stylefeng/rest/modular/order/controller/MentalTestOrderController.java | 34 ++++++++--------------------------
1 files changed, 8 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 b311197..f1ccc50 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,15 @@
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.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.*;
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 +25,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 = "心理测试接口")
@@ -55,15 +49,15 @@
@Resource
private IMentalAnalysisTimeService mentalAnalysisTimeService;
+ @Resource
+ private IMentalAnalysisTimeConfigService mentalAnalysisTimeConfigService;
+
@ApiOperation(value = "心理测试下单", notes = "订单状态，为0需支付（为1无需支付），开始心理测试答题")
@PostResource(name = "心理测试下单", path = "/createOrderMentalTest")
public ResponseData<OrderMentalTest> createOrderMentalTest(@RequestBody CreateOrderMentalTestRequest req) {
OrderMentalTest o = orderMentalTestService.createOrderMentalTest(req.getUserId(), req.getTopicId(), true, false);
return new SuccessResponseData(o);
}
-
- @Resource
- private IMentalAnalysisTimeConfigService mentalAnalysisTimeConfigService;
@ApiOperation(value = "1V1咨询可预约时间")
@GetResource(name = "1V1咨询可预约时间", path = "/mentalAnalysisTime")
@@ -89,24 +83,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