From 94e9dc3adb80baf6e1d7d56e54a93917996bc339 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期日, 28 四月 2024 11:21:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
rest/src/main/java/cn/stylefeng/rest/modular/order/controller/MentalTestOrderController.java | 54 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 31 insertions(+), 23 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 3b1c8a5..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,6 +1,5 @@
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;
@@ -14,10 +13,6 @@
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;
@@ -64,34 +59,47 @@
return new SuccessResponseData(o);
}
+ @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")
public ResponseData<List<MentalAnalysisTime>> mentalAnalysisTime() {
- List<MentalAnalysisTime> list = mentalAnalysisTimeService.list(
- Wrappers.<MentalAnalysisTime>lambdaQuery()
- .orderByAsc(MentalAnalysisTime::getModuleNo, MentalAnalysisTime::getWeekDay, MentalAnalysisTime::getBeginTimePoint, MentalAnalysisTime::getEndTimePoint)
- );
- return new SuccessResponseData(list);
- }
+// List<Customer> filteredCustomers = customerService.list(Wrappers.lambdaQuery(Customer.class).eq(Customer::getMentalAnalysisStatus,1)
+// .like(Customer::getPostIds, "31"));
- @Resource
- private CustomerService customerService;
+// if (filteredCustomers.isEmpty()) {
+ List<MentalAnalysisTime> list = mentalAnalysisTimeService.list(
+ Wrappers.<MentalAnalysisTime>lambdaQuery()
+ .orderByAsc(MentalAnalysisTime::getModuleNo, MentalAnalysisTime::getWeekDay, MentalAnalysisTime::getBeginTimePoint, MentalAnalysisTime::getEndTimePoint)
+ );
+ return new SuccessResponseData(list);
+// }else {
+// List<Long> collect = filteredCustomers.stream().map(Customer::getCustomerId).collect(Collectors.toList());
+// List<MentalAnalysisTimeConfig> list = mentalAnalysisTimeConfigService.list(Wrappers.lambdaQuery(MentalAnalysisTimeConfig.class).in(MentalAnalysisTimeConfig::getCounsellingInfoId, collect));
+// HashMap<String,MentalAnalysisTimeConfig> hashMap =new HashMap<>();
+// for (MentalAnalysisTimeConfig mentalAnalysisTimeConfig : list) {
+// hashMap.put(mentalAnalysisTimeConfig.getWeekDay()+mentalAnalysisTimeConfig.getBeginTimePoint()+mentalAnalysisTimeConfig.getEndTimePoint(),mentalAnalysisTimeConfig);
+// }
+// Collection<MentalAnalysisTimeConfig> values = hashMap.values();
+// return new SuccessResponseData(values);
+// }
+ }
@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