From e815e5ac1bf2261c9a4303bffc5e5b77ec33ab01 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Wed, 27 Dec 2023 14:29:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WxUserScriptLogServiceImpl.java       | 10 +++++++++-
 flossom-ui/src/views/system/member/index.vue           |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserScriptLogServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserScriptLogServiceImpl.java
index 68eec75..0204b35 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserScriptLogServiceImpl.java
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserScriptLogServiceImpl.java
@@ -56,7 +56,15 @@ public class WxUserScriptLogServiceImpl implements IWxUserScriptLogService {
      */
     @Override
     public List<WxUserScriptLog> selectWxUserScriptLogList(WxUserScriptLog wxUserScriptLog) {
-        return wxUserScriptLogMapper.selectWxUserScriptLogList(wxUserScriptLog);
+        List<WxUserScriptLog> wxUserScriptLogs = wxUserScriptLogMapper.selectWxUserScriptLogList(wxUserScriptLog);
+        for (WxUserScriptLog userScriptLog : wxUserScriptLogs) {
+            if (userScriptLog.getIsCustom() == 0 && userScriptLog.getScriptTemplateId() != null) {
+                WxScriptTemplate wxScriptTemplate = wxScriptTemplateMapper.selectWxScriptTemplateById(userScriptLog.getScriptTemplateId().longValue());
+                userScriptLog.setContent(wxScriptTemplate.getContent());
+                userScriptLog.setTitile(wxScriptTemplate.getTitile());
+            }
+        }
+        return wxUserScriptLogs;
     }
 
     /**
diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue
index 27dc3fe..0f5533d 100644
--- a/flossom-ui/src/views/system/member/index.vue
+++ b/flossom-ui/src/views/system/member/index.vue
@@ -240,7 +240,7 @@
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="即将过期积分" align="center" prop=""/>
+      <el-table-column label="即将过期积分" align="center" prop="expireCredit"/>
       <el-table-column label="用户类型" align="center" prop="userType">
         <template slot-scope="scope">
           <span v-show="scope.row.userType == 0">游客</span>
@@ -623,8 +623,8 @@
           <el-table-column type="index" width="50"></el-table-column>
           <el-table-column prop="source" label="类型" width="100px">
             <template slot-scope="scope">
-              <span v-show="scope.row.source == 0">减少积分</span>
               <span v-show="scope.row.source == 1">增加积分</span>
+              <span v-show="scope.row.source == 2">减少积分</span>
             </template>
           </el-table-column>
           <el-table-column prop="floatScore" label="变动积分"