From 190c3529ebde69c895b19963c2151ada7ed0aef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?= <14103883+leaf-phos@user.noreply.gitee.com> Date: Sun, 4 May 2025 13:54:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=91=8A=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/bst/order/mapper/OrderMapper.xml | 8 ++++---- .../java/com/ruoyi/web/app/AppAgreementController.java | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/order/mapper/OrderMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/order/mapper/OrderMapper.xml index 80cec45..5c1f7e1 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/order/mapper/OrderMapper.xml +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/order/mapper/OrderMapper.xml @@ -128,8 +128,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bo.cancel_remark like concat('%', #{query.cancelRemark}, '%') and date(bp.pay_time) = #{query.payDate} and bp.channel_id = #{query.payChannelId} - and bp.pay_expire_time <= #{query.payExpireTimeEnd} - and bp.pay_expire_time >= #{query.payExpireTimeStart} + and bo.pay_expire_time <= #{query.payExpireTimeEnd} + and bo.pay_expire_time >= #{query.payExpireTimeStart} and bo.id in ( select distinct bb.bst_id from bst_bonus bb @@ -463,7 +463,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where bo.id = #{id} and bo.total_fee + #{deductionFee} <= bo.deposit_fee - + - + diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAgreementController.java b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAgreementController.java index f2f2c7d..2c357d5 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAgreementController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAgreementController.java @@ -5,6 +5,7 @@ import com.ruoyi.bst.agreement.domain.AgreementQuery; import com.ruoyi.bst.agreement.domain.AgreementVO; import com.ruoyi.bst.agreement.domain.enums.AgreementContentType; import com.ruoyi.bst.agreement.service.AgreementService; +import com.ruoyi.common.annotation.Anonymous; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.collection.CollectionUtils; @@ -21,6 +22,7 @@ public class AppAgreementController extends BaseController { @ApiOperation("查询最新协议") @GetMapping("/latest") + @Anonymous public AjaxResult getAgreement(AgreementQuery query) { PageHelper.startPage(1, 1); PageHelper.orderBy("create_time desc");