From 84699a94126db9fa3faf66613276d591b0b65a98 Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Wed, 31 Mar 2021 11:45:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-=E6=8A=BD?=
 =?UTF-8?q?=E5=A5=96=E6=AC=A1=E6=95=B0=E6=B6=88=E8=B4=B9=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/static/ruoyi/js/ry-ui.js   |  15 ++
 .../activity/mapper/DrawInfoMapper.java       |   2 +
 .../activity/service/IDrawInfoService.java    |   6 +
 .../service/impl/DrawInfoServiceImpl.java     |   7 +-
 .../mapper/activity/DrawInfoMapper.xml        |   4 +
 .../templates/activity/consume/consume.html   | 231 ++++++++++--------
 6 files changed, 156 insertions(+), 109 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
index 9de3eba0a..e7dbce753 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
@@ -510,6 +510,21 @@ var table = {
                 });
                 return actions.join('');
             },
+            // 回显活动名称
+            selectDrawname: function(datas, value) {
+                if ($.common.isEmpty(datas) || $.common.isEmpty(value)) {
+                    return '';
+                }
+                var actions = [];
+                $.each(datas, function(index, draw) {
+                    if (draw.drawcode == ('' + value)) {
+                        var listClass = $.common.equals("default", draw.listClass) || $.common.isEmpty(draw.listClass) ? "" : "badge badge-" + draw.listClass;
+                        actions.push($.common.sprintf("<span class='%s'>%s</span>", listClass, draw.drawname));
+                        return false;
+                    }
+                });
+                return actions.join('');
+            },
             // 回显数据字典（字符串数组）
             selectDictLabels: function(datas, value, separator) {
             	if ($.common.isEmpty(datas) || $.common.isEmpty(value)) {
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawInfoMapper.java b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawInfoMapper.java
index 3962dd31a..a8cecb22d 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawInfoMapper.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawInfoMapper.java
@@ -29,6 +29,8 @@ public interface DrawInfoMapper
      */
     public List<DrawInfo> selectDrawInfoList(DrawInfo drawInfo);
 
+    List<DrawInfo> findDrawInfoList();
+
     /**
      * 新增抽奖活动管理对象
      * 
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java
index 29ea2bf75..1435171f3 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java
@@ -29,6 +29,12 @@ public interface IDrawInfoService
      */
     public List<DrawInfo> selectDrawInfoList(DrawInfo drawInfo);
 
+    /**
+     * 查询活动列表-下拉用
+     * @return
+     */
+    public List<DrawInfo> findDrawInfoList();
+
     /**
      * 新增抽奖活动管理对象
      * 
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java
index 8a2c2a4a8..948480cc0 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java
@@ -16,7 +16,7 @@ import com.ruoyi.common.core.text.Convert;
  * @author xlh
  * @date 2021-03-25
  */
-@Service
+@Service("drawInfo")
 public class DrawInfoServiceImpl implements IDrawInfoService
 {
     @Autowired
@@ -46,6 +46,11 @@ public class DrawInfoServiceImpl implements IDrawInfoService
         return drawInfoMapper.selectDrawInfoList(drawInfo);
     }
 
+    @Override
+    public List<DrawInfo> findDrawInfoList() {
+        return drawInfoMapper.findDrawInfoList();
+    }
+
     /**
      * 新增抽奖活动管理对象
      * 
diff --git a/sino-activity/src/main/resources/mapper/activity/DrawInfoMapper.xml b/sino-activity/src/main/resources/mapper/activity/DrawInfoMapper.xml
index d67c7da8f..126ce3df1 100644
--- a/sino-activity/src/main/resources/mapper/activity/DrawInfoMapper.xml
+++ b/sino-activity/src/main/resources/mapper/activity/DrawInfoMapper.xml
@@ -56,6 +56,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="VALIDATETYPE != null  and VALIDATETYPE != ''"> and VALIDATETYPE = #{VALIDATETYPE}</if>
         </where>
     </select>
+
+    <select id="findDrawInfoList"  resultMap="DrawInfoResult">
+        select DRAWID, DRAWCODE, DRAWTYPE, DRAWNAME from draw_info
+    </select>
     
     <select id="selectDrawInfoById" parameterType="String" resultMap="DrawInfoResult">
 SELECT
diff --git a/sino-activity/src/main/resources/templates/activity/consume/consume.html b/sino-activity/src/main/resources/templates/activity/consume/consume.html
index ec0d62cff..808635d6f 100644
--- a/sino-activity/src/main/resources/templates/activity/consume/consume.html
+++ b/sino-activity/src/main/resources/templates/activity/consume/consume.html
@@ -1,100 +1,111 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('抽奖次数消费信息列表')" />
+    <th:block th:include="include :: header('抽奖次数消费信息列表')"/>
 </head>
 <body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <label>活动代码：</label>
-                                <input type="text" name="DRAWCODE"/>
-                            </li>
-                            <li>
-                                <label>任务流水：</label>
-                                <input type="text" name="TASKID"/>
-                            </li>
-                            <li>
-                                <label>用户标识：</label>
-                                <input type="text" name="USERID"/>
-                            </li>
-                            <li>
-                                <label>次数类型：</label>
-                                <select name="TYPE" th:with="type=${@dict.getType('drawType')}" style="width: 80px">
-                                    <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                                </select>
-                            </li>
-<!--                            <li>-->
-<!--                                <label>使用次数：</label>-->
-<!--                                <input type="text" name="CONSUMENUMBER"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>使用流水：</label>-->
-<!--                                <input type="text" name="TRANSEQNO"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>使用主键：</label>-->
-<!--                                <input type="text" name="TRADEORDERID"/>-->
-<!--                            </li>-->
-                            <li>
-                                <label>状态：</label>
-                                <select name="STATE" th:with="type=${@dict.getType('status')}" style="width: 80px">
-                                    <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                                </select>
-                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>活动代码：</label>
+                            <!--                                <input type="text" name="DRAWCODE"/>-->
+                            <select name="DRAWCODE" th:with="drawinfo=${@drawInfo.findDrawInfoList()}">
+                                <option value="">所有</option>
+                                <option th:each="drawInfo : ${drawinfo}" th:text="${drawInfo.DRAWNAME}"
+                                        th:value="${drawInfo.DRAWCODE}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>任务流水：</label>
+                            <input type="text" name="TASKID"/>
+                        </li>
+                        <li>
+                            <label>用户标识：</label>
+                            <input type="text" name="USERID"/>
+                        </li>
+                        <li>
+                            <label>次数类型：</label>
+                            <select name="TYPE" th:with="type=${@dict.getType('drawType')}" style="width: 80px">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                        th:value="${dict.dictValue}"></option>
+                            </select>
+                        </li>
+                        <!--                            <li>-->
+                        <!--                                <label>使用次数：</label>-->
+                        <!--                                <input type="text" name="CONSUMENUMBER"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>使用流水：</label>-->
+                        <!--                                <input type="text" name="TRANSEQNO"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>使用主键：</label>-->
+                        <!--                                <input type="text" name="TRADEORDERID"/>-->
+                        <!--                            </li>-->
+                        <li>
+                            <label>状态：</label>
+                            <select name="STATE" th:with="type=${@dict.getType('status')}" style="width: 80px">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                        th:value="${dict.dictValue}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
 
-            <div class="btn-group-sm" id="toolbar" role="group">
-<!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="activity:consume:add">-->
-<!--                    <i class="fa fa-plus"></i> 添加-->
-<!--                </a>-->
-<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="activity:consume:edit">-->
-<!--                    <i class="fa fa-edit"></i> 修改-->
-<!--                </a>-->
-<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="activity:consume:remove">-->
-<!--                    <i class="fa fa-remove"></i> 删除-->
-<!--                </a>-->
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="activity:consume:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="activity:consume:add">-->
+            <!--                    <i class="fa fa-plus"></i> 添加-->
+            <!--                </a>-->
+            <!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="activity:consume:edit">-->
+            <!--                    <i class="fa fa-edit"></i> 修改-->
+            <!--                </a>-->
+            <!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="activity:consume:remove">-->
+            <!--                    <i class="fa fa-remove"></i> 删除-->
+            <!--                </a>-->
+            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="activity:consume:export">
+                <i class="fa fa-download"></i> 导出
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
         </div>
     </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('activity:consume:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('activity:consume:remove')}]];
-        var prefix = ctx + "activity/consume";
-        var drawTypes = [[${@dict.getType('drawType')}]];
-        var STATEDatas = [[${@dict.getType('status')}]];
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('activity:consume:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('activity:consume:remove')}]];
+    var prefix = ctx + "activity/consume";
+    var drawTypes = [[${@dict.getType('drawType')}]];
+    var STATEDatas = [[${@dict.getType('status')}]];
+    var drawInfoList = [[${@drawInfo.findDrawInfoList()}]];
+
+    $(function () {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "抽奖次数消费信息",
+            columns: [{
+                checkbox: true
+            },
 
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "抽奖次数消费信息",
-                columns: [{
-                    checkbox: true
-                },
                 {
                     field: 'taskconsumeid',
                     title: '业务主键',
@@ -105,49 +116,53 @@
                     title: '活动次数记录主键',
                     visible: false
                 },
-                {
-                    field: 'drawcode',
-                    title: '活动代码'
-                },
-                {
-                    field: 'taskid',
-                    title: '任务流水'
-                },
                 {
                     field: 'userid',
                     title: '用户标识'
                 },
+                {
+                    field: 'drawcode',
+                    title: '活动代码',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDrawname(drawInfoList, value);
+                    }
+                },
                 {
                     field: 'type',
                     title: '赠送次数类型',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         return $.table.selectDictLabel(drawTypes, value);
                     }
                 },
+                {
+                    field: 'createtimestamp',
+                    title: '创建时间'
+                },
                 {
                     field: 'consumenumber',
                     title: '使用次数'
                 },
+                {
+                    field: 'taskid',
+                    title: '任务流水'
+                },
                 {
                     field: 'transeqno',
                     title: '使用流水'
                 },
                 {
                     field: 'tradeorderid',
-                    title: '使用主键'
+                    title: '使用主键',
+                    visible: false
                 },
                 {
                     field: 'state',
                     title: '状态',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         return $.table.selectDictLabel(STATEDatas, value);
                     }
                 },
                 // {
-                //     field: 'createtimestamp',
-                //     title: '创建时间'
-                // },
-                // {
                 //     field: 'lastupdatetimestamp',
                 //     title: '最后修改时间'
                 // },
@@ -161,10 +176,10 @@
                 //         return actions.join('');
                 //     }
                 // }
-                ]
-            };
-            $.table.init(options);
-        });
-    </script>
+            ]
+        };
+        $.table.init(options);
+    });
+</script>
 </body>
 </html>
\ No newline at end of file