From 339d15eb99805ce78fdd07005d64faacb57d649d Mon Sep 17 00:00:00 2001 From: guohongjin <guohongjin@test.com> Date: 星期三, 08 五月 2024 16:37:56 +0800 Subject: [PATCH] 修改最低价显示 --- rest/src/main/java/cn/stylefeng/rest/modular/order/controller/MentalTestOrderController.java | 37 +++++++++++++++++++++++++++++++------ 1 files changed, 31 insertions(+), 6 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 bdcf7f1..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 @@ -59,19 +59,44 @@ 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")); + +// 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); -- Gitblit v1.7.1