chuangte/electripper-v2
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

公告权限

Browse Source
This commit is contained in:
磷叶 2025-05-04 13:54:41 +08:00
parent 41c4d3c5ba
commit 190c3529eb
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-service/src/main/java/com/ruoyi/bst/order/mapper/OrderMapper.xml
View File

@ -128,8 +128,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.cancelRemark != null and query.cancelRemark != ''"> and bo.cancel_remark like concat('%', #{query.cancelRemark}, '%')</if>
<if test="query.payDate != null "> and date(bp.pay_time) = #{query.payDate}</if>
<if test="query.payChannelId != null "> and bp.channel_id = #{query.payChannelId}</if>
<if test="query.payExpireTimeEnd != null "> and bp.pay_expire_time &lt;= #{query.payExpireTimeEnd}</if>
<if test="query.payExpireTimeStart != null "> and bp.pay_expire_time &gt;= #{query.payExpireTimeStart}</if>
<if test="query.payExpireTimeEnd != null "> and bo.pay_expire_time &lt;= #{query.payExpireTimeEnd}</if>
<if test="query.payExpireTimeStart != null "> and bo.pay_expire_time &gt;= #{query.payExpireTimeStart}</if>
<if test="query.bonusUserId != null ">
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} &lt;= bo.deposit_fee
</update>
<!-- selectIdByQuery -->
<!-- selectIdByQuery -->
<select id="selectIdByQuery" resultType="Long">
select bo.id
@ -472,5 +472,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="searchCondition"/>
</where>
</select>
</mapper>

2
ruoyi-web/src/main/java/com/ruoyi/web/app/AppAgreementController.java
View File

@ -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");