会员管理优化

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;
     }
 
     /**

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="变动积分"