From e2729587d4a8b9c2e3e2c4dd50a25adedb337e98 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 14 八月 2026 15:58:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mall/yudao-module-trade/src/main/resources/mapper/brokerage/BrokerageUserMapper.xml | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/yudao-module-mall/yudao-module-trade/src/main/resources/mapper/brokerage/BrokerageUserMapper.xml b/yudao-module-mall/yudao-module-trade/src/main/resources/mapper/brokerage/BrokerageUserMapper.xml
index 066f75d..69ee4ed 100644
--- a/yudao-module-mall/yudao-module-trade/src/main/resources/mapper/brokerage/BrokerageUserMapper.xml
+++ b/yudao-module-mall/yudao-module-trade/src/main/resources/mapper/brokerage/BrokerageUserMapper.xml
@@ -2,9 +2,19 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.iocoder.yudao.module.trade.dal.mysql.brokerage.BrokerageUserMapper">
+ <sql id="OrderDirection">
+ <choose>
+ <when test="@cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils@isAscOrder(sortingField.order)">
+ ASC
+ </when>
+ <otherwise>
+ DESC
+ </otherwise>
+ </choose>
+ </sql>
+
<select id="selectSummaryPageByUserId"
resultType="cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.AppBrokerageUserChildSummaryRespVO">
-
SELECT bu.id, bu.bind_user_time AS brokerageTime,
(SELECT SUM(price) FROM trade_brokerage_record r
WHERE r.user_id = bu.id AND biz_type = #{bizType} AND r.status = #{status} AND r.deleted = FALSE) AS brokeragePrice,
@@ -23,14 +33,17 @@
</if>
</where>
<choose>
- <when test="sortingField.field == 'userCount'">
- ORDER BY brokerageUserCount ${sortingField.order}
+ <when test="sortingField != null and sortingField.field == 'userCount'">
+ ORDER BY brokerageUserCount
+ <include refid="OrderDirection"/>
</when>
- <when test="sortingField.field == 'orderCount'">
- ORDER BY brokerageOrderCount ${sortingField.order}
+ <when test="sortingField != null and sortingField.field == 'orderCount'">
+ ORDER BY brokerageOrderCount
+ <include refid="OrderDirection"/>
</when>
- <when test="sortingField.field == 'price'">
- ORDER BY brokeragePrice ${sortingField.order}
+ <when test="sortingField != null and sortingField.field == 'price'">
+ ORDER BY brokeragePrice
+ <include refid="OrderDirection"/>
</when>
<otherwise>
ORDER BY bu.bind_user_time DESC
--
Gitblit v1.9.3