From ef81b36de6cb2e86f0194cbc5c1477c77eb0134a Mon Sep 17 00:00:00 2001
From: Ryan <12345678>
Date: Tue, 20 Aug 2024 18:30:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BB=9F=E8=AE=A1=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E3=80=81=E5=8E=BB=E6=8E=89=E9=A1=B5=E9=9D=A2=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/business/BusAgentInfoMapper.xml        |  2 ++
 .../business/BusIntegralHistoryInfoMapper.xml     |  1 +
 .../mapper/business/BusIntegralRecordMapper.xml   |  4 ++--
 ruoyi-ui/src/views/agent/list/index.vue           | 10 +++++-----
 ruoyi-ui/src/views/point/consume/index.vue        | 15 +++++++++++----
 .../src/views/statistics/excellence/index.vue     |  4 ++--
 6 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/business/BusAgentInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusAgentInfoMapper.xml
index 447f74d..e0032f5 100644
--- a/ruoyi-system/src/main/resources/mapper/business/BusAgentInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/business/BusAgentInfoMapper.xml
@@ -92,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             GROUP BY Bind_User
             )	c
             on a.agent_account =  c.Bind_User
+            ORDER BY account ASC
     </select>
 
     <select id="selectBusAgentInfoList" parameterType="BusAgentInfo" resultMap="BusAgentInfoResult">
@@ -113,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null "> and create_time = #{createTime}</if>
             <if test="delStatus != null  and delStatus != ''"> and del_status = #{delStatus}</if>
         </where>
+        ORDER BY agent_account ASC
     </select>
 
     <select id="selectBusAgentInfoById" parameterType="Long" resultMap="BusAgentInfoResult">
diff --git a/ruoyi-system/src/main/resources/mapper/business/BusIntegralHistoryInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusIntegralHistoryInfoMapper.xml
index 9a9bcba..db3f9d5 100644
--- a/ruoyi-system/src/main/resources/mapper/business/BusIntegralHistoryInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/business/BusIntegralHistoryInfoMapper.xml
@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="account != null  and account != ''"> and account = #{account}</if>
             <if test="expStartTime != null and expEndTime != null"> and create_time between #{expStartTime} and #{expEndTime}</if>
         </where>
+        ORDER BY account ASC
     </select>
 
     <insert id="insertBusIntegralHistoryInfo" parameterType="BusIntegralHistoryInfo" useGeneratedKeys="true" keyProperty="id">
diff --git a/ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml
index 6f54e26..296a3c3 100644
--- a/ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml
@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="account != null  and account != ''"> and account = #{account}</if>
         </where>
         GROUP BY DATE_FORMAT(Integral_update_time,'%Y-%m-%d'),account,platform
-        ORDER BY DATE_FORMAT(Integral_update_time,'%Y-%m-%d') desc
+        ORDER BY DATE_FORMAT(Integral_update_time,'%Y-%m-%d') desc, account ASC
     </select>
 
     <select id="selectBusIntegralRecordListA" parameterType="BusIntegralRecord" resultMap="BusIntegralRecordResult">
@@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </foreach>
             </if>
         </where>
-        ORDER BY Integral_update_time desc
+        ORDER BY DATE_FORMAT(Integral_update_time,'%Y-%m-%d') desc, account ASC
     </select>
     <select id="selectBusIntegralRecordById" parameterType="Long" resultMap="BusIntegralRecordResult">
         <include refid="selectBusIntegralRecordVo"/>
diff --git a/ruoyi-ui/src/views/agent/list/index.vue b/ruoyi-ui/src/views/agent/list/index.vue
index 174efe2..897dd26 100644
--- a/ruoyi-ui/src/views/agent/list/index.vue
+++ b/ruoyi-ui/src/views/agent/list/index.vue
@@ -84,22 +84,22 @@
         </template>
       </el-table-column>
       <el-table-column label="代理商编码" align="center" prop="id" />
-      <el-table-column label="代理人账号" align="center" prop="agentAccount" />
-      <el-table-column label="代理人姓名" align="center" prop="agentName" />
+      <el-table-column label="代理人账号" align="center" prop="agentAccount" width="110"/>
+      <el-table-column label="代理人姓名" align="center" prop="agentName" width="110"/>
       <el-table-column label="上级代理商编码" align="center" prop="superiorAgentCode" />
-      <el-table-column label="上级代理商账号" align="center" prop="superiorAgentAccount" />
+      <el-table-column label="上级代理商账号" align="center" prop="superiorAgentAccount" width="110"/>
       <el-table-column label="授权店铺数" align="center" prop="grantStoreNum" />
       <el-table-column label="运营店铺数" align="center" prop="operateStoreNum" />
       <el-table-column label="昨日消耗积分数" align="center" prop="lastUseIntegralNum" />
       <el-table-column label="昨日好评量" align="center" prop="lastPositiveReviewsNum" />
       <el-table-column label="安全营销余额" align="center" prop="aiDurationBalance" />
       <el-table-column label="普通营销余额" align="center" prop="aiRealTimeNum" />
-      <el-table-column label="上次登录时间" align="center" prop="lastLoginTime" width="180">
+      <el-table-column label="上次登录时间" align="center" prop="lastLoginTime" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.lastLoginTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="上次登录ip" align="center" prop="lastLoginIp" />
+      <el-table-column label="上次登录ip" align="center" prop="lastLoginIp" width="130"/>
       <el-table-column label="登录次数" align="center" prop="loginNum" />
       <!-- <el-table-column label="删除状态" align="center" prop="delStatus" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
diff --git a/ruoyi-ui/src/views/point/consume/index.vue b/ruoyi-ui/src/views/point/consume/index.vue
index 80e78b0..3d02a6f 100644
--- a/ruoyi-ui/src/views/point/consume/index.vue
+++ b/ruoyi-ui/src/views/point/consume/index.vue
@@ -21,10 +21,17 @@
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+         type="warning"
+         plain
+         icon="el-icon-download"
+         size="mini"
+         @click="handleExport"
+       >导出</el-button>
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -34,7 +41,7 @@
           @click="handleAdd"
           v-hasPermi="['system:record:add']"
         >新增</el-button>
-      </el-col>
+      </el-col> -->
 <!--      <el-col :span="1.5">-->
 <!--        <el-button-->
 <!--          type="success"-->
@@ -57,7 +64,7 @@
 <!--          v-hasPermi="['system:record:remove']"-->
 <!--        >删除</el-button>-->
 <!--      </el-col>-->
-     <el-col :span="1.5">
+     <!-- <el-col :span="1.5">
        <el-button
          type="warning"
          plain
@@ -68,7 +75,7 @@
        >导出</el-button>
      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
diff --git a/ruoyi-ui/src/views/statistics/excellence/index.vue b/ruoyi-ui/src/views/statistics/excellence/index.vue
index 680b8e8..a4f92e5 100644
--- a/ruoyi-ui/src/views/statistics/excellence/index.vue
+++ b/ruoyi-ui/src/views/statistics/excellence/index.vue
@@ -15,7 +15,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -59,7 +59,7 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />