From 1ebca429a424d54d93f28078ceba6becb898eab6 Mon Sep 17 00:00:00 2001 From: cjw Date: Fri, 22 Nov 2024 14:02:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/wx/WxScaleController.java | 4 ++++ .../system/service/impl/ActivityServiceImpl.java | 3 +-- .../service/impl/ReservationOrderServiceImpl.java | 14 ++++++++++++-- .../service/impl/SysScaleOrderServiceImpl.java | 8 ++++++++ .../mapper/system/SysEvaluationRecordMapper.xml | 2 +- 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxScaleController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxScaleController.java index 09c499b..3264875 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxScaleController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wx/WxScaleController.java @@ -1,5 +1,6 @@ package org.dromara.system.controller.wx; +import cn.dev33.satoken.annotation.SaIgnore; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.TenantConstants; @@ -40,6 +41,7 @@ public class WxScaleController extends BaseController { /** * 查询心理测评量列表 */ + @SaIgnore @GetMapping("/pageList") public TableDataInfo pageList(SysScaleBo bo, PageQuery pageQuery) { bo.setOrderBy("num"); @@ -49,6 +51,7 @@ public class WxScaleController extends BaseController { /** * 查询心理测评量列表 */ + @SaIgnore @GetMapping("/typeList") public R> pageListTest(SysScaleBo bo) { bo.setOrderBy("num"); @@ -58,6 +61,7 @@ public class WxScaleController extends BaseController { /** * 查询心理测评量列表,默认展示两条数据 */ + @SaIgnore @GetMapping("/list") public R>> list(String scaleType) { if (StringUtils.isEmpty(scaleType)) { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ActivityServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ActivityServiceImpl.java index 2412b02..9edc91d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ActivityServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ActivityServiceImpl.java @@ -86,8 +86,7 @@ public class ActivityServiceImpl implements IActivityService { private LambdaQueryWrapper buildQueryWrapper(ActivityBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(StringUtils.isNotBlank(bo.getActivityTitle()), Activity::getActivityTitle, bo.getActivityTitle()); - lqw.eq(StringUtils.isNotBlank(bo.getActivityDetails()), Activity::getActivityDetails, bo.getActivityDetails()); + lqw.like(StringUtils.isNotBlank(bo.getActivityTitle()), Activity::getActivityTitle, bo.getActivityTitle()); lqw.eq(bo.getStartTime() != null, Activity::getStartTime, bo.getStartTime()); lqw.eq(bo.getEndTime() != null, Activity::getEndTime, bo.getEndTime()); lqw.eq(bo.getStatus() != null, Activity::getStatus, bo.getStatus()); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ReservationOrderServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ReservationOrderServiceImpl.java index d03e9ae..5ed1264 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ReservationOrderServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ReservationOrderServiceImpl.java @@ -9,6 +9,7 @@ import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest; import com.github.binarywang.wxpay.service.WxPayService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.service.OssService; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.mybatis.core.page.PageQuery; @@ -114,11 +115,20 @@ public class ReservationOrderServiceImpl implements IReservationOrderService { @Override public WxPayMpOrderResult insertByBo(ReservationOrderBo bo) throws Exception { String openId = LoginHelper.getOpenId(); + Long userId = LoginHelper.getUserId(); BigDecimal price; Long id = bo.getId(); if (id == null) { ReservationOrder add = MapstructUtils.convert(bo, ReservationOrder.class); - ReservationTime reservationTime = timeMapper.selectById(add.getTimeId()); + Long timeId = add.getTimeId(); + boolean exists = baseMapper.exists(new LambdaQueryWrapper() + .eq(ReservationOrder::getTimeId, timeId) + .eq(ReservationOrder::getCreateBy, userId) + .eq(ReservationOrder::getOrderStatus, 0)); + if(exists){ + throw new ServiceException("账户下已有此预约时间的待支付订单，请确认后再支付"); + } + ReservationTime reservationTime = timeMapper.selectById(timeId); Counselor counselor = counselorMapper.selectById(reservationTime.getCounselorId()); price = counselor.getPrice(); add.setCounselorId(counselor.getId()); @@ -128,7 +138,7 @@ public class ReservationOrderServiceImpl implements IReservationOrderService { validEntityBeforeSave(add); baseMapper.insert(add); id = add.getId(); - }else{ + } else { ReservationOrder reservationOrder = baseMapper.selectById(id); Counselor counselor = counselorMapper.selectById(reservationOrder.getCounselorId()); price = counselor.getPrice(); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleOrderServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleOrderServiceImpl.java index 287f8e7..ea82682 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleOrderServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysScaleOrderServiceImpl.java @@ -9,6 +9,7 @@ import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest; import com.github.binarywang.wxpay.service.WxPayService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.service.OssService; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.mybatis.core.page.PageQuery; @@ -118,6 +119,13 @@ public class SysScaleOrderServiceImpl implements ISysScaleOrderService { Long userId = LoginHelper.getUserId(); SysScaleOrder add = MapstructUtils.convert(bo, SysScaleOrder.class); Long scaleId = add.getScaleId(); + boolean exists = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysScaleOrder::getScaleId, scaleId) + .eq(SysScaleOrder::getCreateBy, userId) + .eq(SysScaleOrder::getOrderStatus, 0)); + if (exists) { + throw new ServiceException("账户下已有此量表的待支付订单，请确认后再支付"); + } //初始量测记录 SysEvaluationRecord record = new SysEvaluationRecord(); record.setUserId(userId); diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysEvaluationRecordMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysEvaluationRecordMapper.xml index 73f4081..aaed3d8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysEvaluationRecordMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysEvaluationRecordMapper.xml @@ -100,7 +100,7 @@ select scale_id from sys_evaluation_record where user_id = #{userId} - and tenant_id = '000000' + and status >= 0 group by scale_id