From cabd7e2ae949335be191a5449fb0203996c16828 Mon Sep 17 00:00:00 2001
From: yeungchihang <842328916@qq.com>
Date: Wed, 11 Jan 2023 11:47:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=B2=BE=E7=81=B5=E4=BC=98=E5=8C=96-?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0-=E6=A1=A3=E4=BD=8D=E5=92=8C=E4=B8=AA?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/SeekElfinAdminMapper.xml    | 2 +-
 .../controller/seekelfin/SeekElfinAdminController.java    | 8 ++++++--
 .../html/seekelfin/seek_elfin_user_record_admin.html      | 6 ++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/accompany-admin/accompany-admin-service/src/main/resources/mapper/SeekElfinAdminMapper.xml b/accompany-admin/accompany-admin-service/src/main/resources/mapper/SeekElfinAdminMapper.xml
index ff6f3d57e..627095d11 100644
--- a/accompany-admin/accompany-admin-service/src/main/resources/mapper/SeekElfinAdminMapper.xml
+++ b/accompany-admin/accompany-admin-service/src/main/resources/mapper/SeekElfinAdminMapper.xml
@@ -24,7 +24,7 @@
     </select>
 
     <select id="listUserDrawRecord" resultType="com.accompany.admin.vo.seekelfin.SeekElfinAdminUserRecordVO">
-        select sr.id,sr.uid,u.erban_no,u.nick,sr.cost_gold_num,sr.receive_gold_num,sr.create_time
+        select sr.id,sr.uid,u.erban_no,u.nick,sr.selectd_no_num `select_no_num`, sr.prod_id, sr.cost_gold_num,sr.receive_gold_num,sr.create_time
         from seek_elfin_record sr, users u
         where sr.uid = u.uid
         <if test="startTime != null and startTime != ''">
diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/seekelfin/SeekElfinAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/seekelfin/SeekElfinAdminController.java
index 35c5437f5..2ec6052c1 100644
--- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/seekelfin/SeekElfinAdminController.java
+++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/seekelfin/SeekElfinAdminController.java
@@ -113,8 +113,10 @@ public class SeekElfinAdminController extends BaseController {
             headerList.add("uid");
             headerList.add("平台号");
             headerList.add("昵称");
-            headerList.add("购买头饰");
-            headerList.add("平台价值");
+            headerList.add("档位");
+            headerList.add("购买个数");
+            headerList.add("花费总钻石数");
+            headerList.add("产出平台价值");
             headerList.add("时间");
             String fileName = "用户寻找小精灵记录.xls";
             List<List> excelRows = buildExcelData(recordList);
@@ -137,6 +139,8 @@ public class SeekElfinAdminController extends BaseController {
             excelData.add(vo.getUid());
             excelData.add(vo.getErbanNo());
             excelData.add(vo.getNick());
+            excelData.add(vo.getProdId());
+            excelData.add(vo.getSelectNoNum());
             excelData.add(vo.getCostGoldNum());
             excelData.add(vo.getReceiveGoldNum());
             excelData.add(DateTimeUtil.convertDate(vo.getCreateTime(), DateTimeUtil.DEFAULT_DATETIME_PATTERN));
diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/seekelfin/seek_elfin_user_record_admin.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/seekelfin/seek_elfin_user_record_admin.html
index e8b1227f1..eb5cd2cb7 100644
--- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/seekelfin/seek_elfin_user_record_admin.html
+++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/seekelfin/seek_elfin_user_record_admin.html
@@ -77,8 +77,10 @@
                 {field: 'uid', title: 'uid', align: 'center', width: '5%'},
                 {field: 'erbanNo', title: '平台号', align: 'center', width: '5%'},
                 {field: 'nick', title: '昵称', align: 'center', width: '5%'},
-                {field: 'costGoldNum', title: '购买头饰', align: 'center', width: '5%'},
-                {field: 'receiveGoldNum', title: '平台价值', align: 'center', width: '5%'},
+                {field: 'prodId', title: '档位', align: 'center', width: '5%'},
+                {field: 'selectNoNum', title: '购买个数', align: 'center', width: '5%'},
+                {field: 'costGoldNum', title: '花费总钻石数', align: 'center', width: '5%'},
+                {field: 'receiveGoldNum', title: '产出平台价值', align: 'center', width: '5%'},
                 {field: 'createTime', title: '时间', align: 'center', width: '5%',
                     formatter: function (val, row, index) {
                         if (val) {