ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/activity' into activity_xlh

This commit is contained in:
xu0625 2021-03-31 14:55:33 +08:00
parent 5548889329 887165b128
commit bf6ca95d16
18 changed files with 796 additions and 615 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
View File

@ -510,6 +510,36 @@ var table = {
}); });
return actions.join(''); 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('');
},
// 回显奖品名称
selectprivename: function(datas, value) {
if ($.common.isEmpty(datas) || $.common.isEmpty(value)) {
return '';
}
var actions = [];
$.each(datas, function(index, draw) {
if (draw.prizecode == ('' + 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.prizename));
return false;
}
});
return actions.join('');
},
// 回显数据字典（字符串数组） // 回显数据字典（字符串数组）
selectDictLabels: function(datas, value, separator) { selectDictLabels: function(datas, value, separator) {
if ($.common.isEmpty(datas) || $.common.isEmpty(value)) { if ($.common.isEmpty(datas) || $.common.isEmpty(value)) {

2
sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawInfoMapper.java
View File

@ -29,6 +29,8 @@ public interface DrawInfoMapper
*/ */
public List<DrawInfo> selectDrawInfoList(DrawInfo drawInfo); public List<DrawInfo> selectDrawInfoList(DrawInfo drawInfo);
List<DrawInfo> findDrawInfoList();
/** /**
* 新增抽奖活动管理对象 * 新增抽奖活动管理对象
* *

2
sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawPrizeInfoMapper.java
View File

@ -33,6 +33,8 @@ public interface DrawPrizeInfoMapper
*/ */
public List<DrawPrizeInfo> selectDrawPrizeInfoList(DrawPrizeInfo drawPrizeInfo); public List<DrawPrizeInfo> selectDrawPrizeInfoList(DrawPrizeInfo drawPrizeInfo);
List<DrawPrizeInfo> findDrawPrizeInfoList();
/** /**
* 新增存储奖品的基础信息 * 新增存储奖品的基础信息
* *

6
sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java
View File

@ -29,6 +29,12 @@ public interface IDrawInfoService
*/ */
public List<DrawInfo> selectDrawInfoList(DrawInfo drawInfo); public List<DrawInfo> selectDrawInfoList(DrawInfo drawInfo);
/**
* 查询活动列表-下拉用
* @return
*/
public List<DrawInfo> findDrawInfoList();
/** /**
* 新增抽奖活动管理对象 * 新增抽奖活动管理对象
* *

6
sino-activity/src/main/java/com/sinosoft/activity/service/IDrawPrizeInfoService.java
View File

@ -27,6 +27,12 @@ public interface IDrawPrizeInfoService
*/ */
public List<DrawPrizeInfo> selectDrawPrizeInfoList(DrawPrizeInfo drawPrizeInfo); public List<DrawPrizeInfo> selectDrawPrizeInfoList(DrawPrizeInfo drawPrizeInfo);
/**
* 奖品列表-下拉框
* @return
*/
List<DrawPrizeInfo> findDrawPrizeInfoList();
/** /**
* 新增存储奖品的基础信息 * 新增存储奖品的基础信息
* *

7
sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java
View File

@ -16,7 +16,7 @@ import com.ruoyi.common.core.text.Convert;
* @author xlh * @author xlh
* @date 2021-03-25 * @date 2021-03-25
*/ */
@Service @Service("drawInfo")
public class DrawInfoServiceImpl implements IDrawInfoService public class DrawInfoServiceImpl implements IDrawInfoService
{ {
@Autowired @Autowired
@ -46,6 +46,11 @@ public class DrawInfoServiceImpl implements IDrawInfoService
return drawInfoMapper.selectDrawInfoList(drawInfo); return drawInfoMapper.selectDrawInfoList(drawInfo);
} }
@Override
public List<DrawInfo> findDrawInfoList() {
return drawInfoMapper.findDrawInfoList();
}
/** /**
* 新增抽奖活动管理对象 * 新增抽奖活动管理对象
* *

7
sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawPrizeInfoServiceImpl.java
View File

@ -15,7 +15,7 @@ import com.ruoyi.common.core.text.Convert;
* @author dy * @author dy
* @date 2021-03-25 * @date 2021-03-25
*/ */
@Service @Service("drawPrize")
public class DrawPrizeInfoServiceImpl implements IDrawPrizeInfoService public class DrawPrizeInfoServiceImpl implements IDrawPrizeInfoService
{ {
@Autowired @Autowired
@ -45,6 +45,11 @@ public class DrawPrizeInfoServiceImpl implements IDrawPrizeInfoService
return drawPrizeInfoMapper.selectDrawPrizeInfoList(drawPrizeInfo); return drawPrizeInfoMapper.selectDrawPrizeInfoList(drawPrizeInfo);
} }
@Override
public List<DrawPrizeInfo> findDrawPrizeInfoList() {
return drawPrizeInfoMapper.findDrawPrizeInfoList();
}
/** /**
* 新增存储奖品的基础信息 * 新增存储奖品的基础信息
* *

4
sino-activity/src/main/resources/mapper/activity/DrawInfoMapper.xml
View File

@ -56,6 +56,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="VALIDATETYPE != null and VALIDATETYPE != ''"> and VALIDATETYPE = #{VALIDATETYPE}</if> <if test="VALIDATETYPE != null and VALIDATETYPE != ''"> and VALIDATETYPE = #{VALIDATETYPE}</if>
</where> </where>
</select> </select>
<select id="findDrawInfoList" resultMap="DrawInfoResult">
select DRAWID, DRAWCODE, DRAWTYPE, DRAWNAME from draw_info
</select>
<select id="selectDrawInfoById" parameterType="String" resultMap="DrawInfoResult"> <select id="selectDrawInfoById" parameterType="String" resultMap="DrawInfoResult">
SELECT SELECT

4
sino-activity/src/main/resources/mapper/activity/DrawPrizeInfoMapper.xml
View File

@ -35,6 +35,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="INTEGRALPROJECTCODE != null and INTEGRALPROJECTCODE != ''"> and INTEGRALPROJECTCODE = #{INTEGRALPROJECTCODE}</if> <if test="INTEGRALPROJECTCODE != null and INTEGRALPROJECTCODE != ''"> and INTEGRALPROJECTCODE = #{INTEGRALPROJECTCODE}</if>
</where> </where>
</select> </select>
<select id="findDrawPrizeInfoList" resultMap="DrawPrizeInfoResult">
<include refid="selectDrawPrizeInfoVo"/>
</select>
<select id="selectDrawPrizeInfoById" parameterType="java.lang.String" resultMap="DrawPrizeInfoResult"> <select id="selectDrawPrizeInfoById" parameterType="java.lang.String" resultMap="DrawPrizeInfoResult">
<include refid="selectDrawPrizeInfoVo"/> <include refid="selectDrawPrizeInfoVo"/>

292
sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html
View File

@ -1,150 +1,167 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('活动次数记录信息列表')" /> <th:block th:include="include :: header('活动次数记录信息列表')"/>
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 search-collapse"> <div class="col-sm-12 search-collapse">
<form id="formId"> <form id="formId">
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li> <li>
<label>活动代码：</label> <label>活动名称：</label>
<input type="text" name="DRAWCODE"/> <select name="DRAWCODE" th:with="drawinfo=${@drawInfo.findDrawInfoList()}">
</li> <option value="">所有</option>
<li> <option th:each="drawInfo : ${drawinfo}" th:text="${drawInfo.DRAWNAME}"
<label>任务流水：</label> th:value="${drawInfo.DRAWCODE}"></option>
<input type="text" name="TASKID"/> </select>
</li> </li>
<li> <li>
<label>次数类型：</label> <label>任务流水：</label>
<select name="TYPE" th:with="type=${@dict.getType('drawType')}"> <input type="text" name="TASKID"/>
<option value="">所有</option> </li>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<!-- <li>-->
<!-- <label>赠送次数：</label>-->
<!-- <input type="text" name="ADDNUMBER"/>-->
<!-- </li>-->
<li>
<label>状态：</label>
<select name="STATE" th:with="type=${@dict.getType('status')}">
<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="AVAILABLENUMBER"/>-->
<!-- </li>-->
<li>
<label>手机号：</label>
<input type="text" name="PHONE"/>
</li>
<!-- <li>-->
<!-- <label>身份认证状态：</label>-->
<!-- <input type="text" name="VSTATE"/>-->
<!-- </li>-->
<li>
<label>用户等级：</label>
<input type="text" name="ULEVEL"/>
</li>
<!-- <li>-->
<!-- <label>请求来源：</label>-->
<!-- <input type="text" name="SOURCE"/>-->
<!-- </li>-->
<!-- <li>-->
<!-- <label>是否白名单：</label>-->
<!-- <input type="text" name="ISSPECIALFLAG"/>-->
<!-- </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"> <li>
<!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="activity:DrawTaskNotify:add">--> <label>用户标识：</label>
<!-- <i class="fa fa-plus"></i> 添加--> <input type="text" name="USERID"/>
<!-- </a>--> </li>
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="activity:DrawTaskNotify:edit">--> <!-- <li>-->
<!-- <i class="fa fa-edit"></i> 修改--> <!-- <label>手机号：</label>-->
<!-- </a>--> <!-- <input type="text" name="PHONE"/>-->
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="activity:DrawTaskNotify:remove">--> <!-- </li>-->
<!-- <i class="fa fa-remove"></i> 删除--> <!-- <li>-->
<!-- </a>--> <!-- <label>身份认证状态：</label>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="activity:DrawTaskNotify:export"> <!-- <input type="text" name="VSTATE"/>-->
<i class="fa fa-download"></i> 导出 <!-- </li>-->
</a> <!-- <li>-->
</div> <!-- <label>用户等级：</label>-->
<div class="col-sm-12 select-table table-striped"> <!-- <input type="text" name="ULEVEL"/>-->
<table id="bootstrap-table"></table> <!-- </li>-->
</div> <!-- <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="ADDNUMBER"/>-->
<!-- </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>-->
<!-- <label>请求来源：</label>-->
<!-- <input type="text" name="SOURCE"/>-->
<!-- </li>-->
<!-- <li>-->
<!-- <label>是否白名单：</label>-->
<!-- <input type="text" name="ISSPECIALFLAG"/>-->
<!-- </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:DrawTaskNotify:add">-->
<!-- <i class="fa fa-plus"></i> 添加-->
<!-- </a>-->
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="activity:DrawTaskNotify:edit">-->
<!-- <i class="fa fa-edit"></i> 修改-->
<!-- </a>-->
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="activity:DrawTaskNotify:remove">-->
<!-- <i class="fa fa-remove"></i> 删除-->
<!-- </a>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()"
shiro:hasPermission="activity:DrawTaskNotify: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>
</div> </div>
<th:block th:include="include :: footer" /> </div>
<script th:inline="javascript"> <th:block th:include="include :: footer"/>
var editFlag = [[${@permission.hasPermi('activity:DrawTaskNotify:edit')}]]; <script th:inline="javascript">
var removeFlag = [[${@permission.hasPermi('activity:DrawTaskNotify:remove')}]]; var editFlag = [[${@permission.hasPermi('activity:DrawTaskNotify:edit')}]];
var STATEDatas = [[${@dict.getType('status')}]]; var removeFlag = [[${@permission.hasPermi('activity:DrawTaskNotify:remove')}]];
var prefix = ctx + "activity/DrawTaskNotify"; var STATEDatas = [[${@dict.getType('status')}]];
var drawTypes = [[${@dict.getType('drawType')}]]; var prefix = ctx + "activity/DrawTaskNotify";
var drawTypes = [[${@dict.getType('drawType')}]];
var drawInfoList = [[${@drawInfo.findDrawInfoList()}]];
$(function() { $(function () {
var options = { var options = {
url: prefix + "/list", url: prefix + "/list",
createUrl: prefix + "/add", createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}", updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
modalName: "活动次数记录信息", modalName: "活动次数记录信息",
columns: [{ columns: [{
checkbox: true checkbox: true
}, },
// {
// field: 'tasknotifyid',
// title: '业务主键'
// },
{ {
field: 'drawcode', field: 'tasknotifyid',
title: '活动代码' title: '业务主键',
},
{
field: 'taskid',
title: '任务流水'
},
{
field: 'userid',
title: '用户标识',
visible: false visible: false
}, },
{ {
field: 'type', field: 'userid',
title: '赠送次数类型', title: '用户标识'
formatter: function(value, row, index) { },
return $.table.selectDictLabel(drawTypes, value); {
field: 'drawcode',
title: '活动名称',
formatter: function (value, row, index) {
return $.table.selectDrawname(drawInfoList, value);
} }
}, },
{ {
field: 'addnumber', field: 'addnumber',
title: '赠送次数' title: '赠送次数'
}, },
{
field: 'availablenumber',
title: '可用次数'
},
{ {
field: 'state', field: 'state',
title: '状态', title: '状态',
formatter: function(value, row, index) { formatter: function (value, row, index) {
return $.table.selectDictLabel(STATEDatas, value); return $.table.selectDictLabel(STATEDatas, value);
} }
}, },
{ {
field: 'availablenumber', field: 'type',
title: '可用次数' title: '赠送次数类型',
formatter: function (value, row, index) {
return $.table.selectDictLabel(drawTypes, value);
}
},
{
field: 'taskid',
title: '任务流水'
},
{
field: 'tasktype',
title: '请求类型'
}, },
{ {
field: 'checkingdate', field: 'checkingdate',
@ -153,28 +170,29 @@
}, },
{ {
field: 'phone', field: 'phone',
title: '手机号' title: '手机号',
visible: false
}, },
{ {
field: 'tasktype', field: 'vstate',
title: '请求类型', title: '身份认证状态',
visible: false visible: false
}, },
{
field: 'vstate',
title: '身份认证状态'
},
{ {
field: 'ulevel', field: 'ulevel',
title: '用户等级' title: '用户等级',
visible: false
}, },
{ {
field: 'source', field: 'source',
title: '请求来源' title: '请求来源',
visible: false
}, },
{ {
field: 'isspecialflag', field: 'isspecialflag',
title: '是否白名单' title: '是否白名单',
visible: false
}, },
{ {
field: 'requestflag', field: 'requestflag',
@ -191,10 +209,10 @@
// return actions.join(''); // return actions.join('');
// } // }
// } // }
] ]
}; };
$.table.init(options); $.table.init(options);
}); });
</script> </script>
</body> </body>
</html> </html>

2
sino-activity/src/main/resources/templates/activity/awardRecord/add.html
View File

@ -14,7 +14,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">奖品代码：</label> <label class="col-sm-3 control-label">奖品名称：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="PRIZECODE" class="form-control" type="text"> <input name="PRIZECODE" class="form-control" type="text">
</div> </div>

2
sino-activity/src/main/resources/templates/activity/awardRecord/edit.html
View File

@ -15,7 +15,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">奖品代码：</label> <label class="col-sm-3 control-label">奖品名称：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="PRIZECODE" th:field="*{PRIZECODE}" class="form-control" type="text"> <input name="PRIZECODE" th:field="*{PRIZECODE}" class="form-control" type="text">
</div> </div>

431
sino-activity/src/main/resources/templates/activity/awardRecord/record.html
View File

@ -1,185 +1,212 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('记录发奖信息列表')" /> <th:block th:include="include :: header('记录发奖信息列表')"/>
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 search-collapse"> <div class="col-sm-12 search-collapse">
<form id="formId"> <form id="formId">
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li> <li>
<label>活动代码：</label> <label>活动名称：</label>
<input type="text" name="DRAWCODE"/> <select name="DRAWCODE" th:with="drawinfo=${@drawInfo.findDrawInfoList()}">
</li> <option value="">所有</option>
<!-- <li>--> <option th:each="drawInfo : ${drawinfo}" th:text="${drawInfo.DRAWNAME}"
<!-- <label>奖品代码：</label>--> th:value="${drawInfo.DRAWCODE}"></option>
<!-- <input type="text" name="PRIZECODE"/>--> </select>
<!-- </li>--> </li>
<!-- <li>--> <li>
<!-- <label>用户标识：</label>--> <label>奖品名称：</label>
<!-- <input type="text" name="USERID"/>--> <select name="PRIZECODE" th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}">
<!-- </li>--> <option value="">所有</option>
<!-- <li>--> <option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
<!-- <label>抽奖记录标识：</label>--> th:value="${drawPrize.PRIZECODE}"></option>
<!-- <input type="text" name="DRAWRECORDID"/>--> </select>
<!-- </li>--> </li>
<li> <li>
<label>发奖时间：</label> <label>用户标识：</label>
<input type="text" class="time-input" placeholder="请选择发奖时间" name="AWARDTIME"/> <input type="text" name="USERID"/>
</li> </li>
<!-- <li>--> <!-- <li>-->
<!-- <label>发奖结果：</label>--> <!-- <label>抽奖记录标识：</label>-->
<!-- <input type="text" name="AWARDRESULT"/>--> <!-- <input type="text" name="DRAWRECORDID"/>-->
<!-- </li>--> <!-- </li>-->
<!-- <li>--> <!-- <li>-->
<!-- <label>错误码：</label>--> <!-- <label>发奖时间：</label>-->
<!-- <input type="text" name="RETURNCODE"/>--> <!-- <input type="text" class="time-input" placeholder="请选择发奖时间" name="AWARDTIME"/>-->
<!-- </li>--> <!-- </li>-->
<!-- <li>--> <li>
<!-- <label>错误信息：</label>--> <label>发奖结果：</label>
<!-- <input type="text" name="RETURNMESSAGE"/>--> <select name="AWARDRESULT" th:with="type=${@dict.getType('drawResult')}" style="width: 80px">
<!-- </li>--> <option value="">所有</option>
<li> <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
<label>手机号：</label> th:value="${dict.dictValue}"></option>
<input type="text" name="PHONE"/> </select>
</li> </li>
<li> <!-- <li>-->
<label>用户名：</label> <!-- <label>错误码：</label>-->
<input type="text" name="USERNAME"/> <!-- <input type="text" name="RETURNCODE"/>-->
</li> <!-- </li>-->
<!-- <li>--> <!-- <li>-->
<!-- <label>抽奖流水：</label>--> <!-- <label>错误信息：</label>-->
<!-- <input type="text" name="DRAWTRANSEQNO"/>--> <!-- <input type="text" name="RETURNMESSAGE"/>-->
<!-- </li>--> <!-- </li>-->
<!-- <li>--> <li>
<!-- <label>发奖流水：</label>--> <label>手机号：</label>
<!-- <input type="text" name="AWARDTRANSEQNO"/>--> <input type="text" name="PHONE"/>
<!-- </li>--> </li>
<li> <li>
<label>奖品等级：</label> <label>用户名：</label>
<select name="PRIZELEVEL" th:with="type=${@dict.getType('prizeLevel')}"> <input type="text" name="USERNAME"/>
<option value="">所有</option> </li>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <!-- <li>-->
</select> <!-- <label>抽奖流水：</label>-->
</li> <!-- <input type="text" name="DRAWTRANSEQNO"/>-->
<li> <!-- </li>-->
<label>奖品类型：</label> <!-- <li>-->
<select name="PRIZETYPE" th:with="type=${@dict.getType('prizeType')}"> <!-- <label>发奖流水：</label>-->
<option value="">所有</option> <!-- <input type="text" name="AWARDTRANSEQNO"/>-->
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <!-- </li>-->
</select> <li>
</li> <label>奖品等级：</label>
<!-- <li>--> <select name="PRIZELEVEL" th:with="type=${@dict.getType('prizeLevel')}" style="width: 80px">
<!-- <label>商户号：</label>--> <option value="">所有</option>
<!-- <input type="text" name="MERCHANTCODE"/>--> <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
<!-- </li>--> th:value="${dict.dictValue}"></option>
<!-- <li>--> </select>
<!-- <label>商户系统号：</label>--> </li>
<!-- <input type="text" name="MERCHANTSYSCODE"/>--> <li>
<!-- </li>--> <label>奖品类型：</label>
<!-- <li>--> <select name="PRIZETYPE" th:with="type=${@dict.getType('prizeType')}" style="width: 80px">
<!-- <label>渠道：</label>--> <option value="">所有</option>
<!-- <input type="text" name="CHANNEL"/>--> <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
<!-- </li>--> th:value="${dict.dictValue}"></option>
<!-- <li>--> </select>
<!-- <label>业务领域：</label>--> </li>
<!-- <input type="text" name="BUSINESSAREA"/>--> <!-- <li>-->
<!-- </li>--> <!-- <label>商户号：</label>-->
<!-- <li>--> <!-- <input type="text" name="MERCHANTCODE"/>-->
<!-- <label>城市：</label>--> <!-- </li>-->
<!-- <input type="text" name="CITY"/>--> <!-- <li>-->
<!-- </li>--> <!-- <label>商户系统号：</label>-->
<!-- <li>--> <!-- <input type="text" name="MERCHANTSYSCODE"/>-->
<!-- <label>扩展：</label>--> <!-- </li>-->
<!-- <input type="text" name="EXTID"/>--> <!-- <li>-->
<!-- </li>--> <!-- <label>渠道：</label>-->
<li> <!-- <input type="text" name="CHANNEL"/>-->
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a> <!-- </li>-->
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a> <!-- <li>-->
</li> <!-- <label>业务领域：</label>-->
</ul> <!-- <input type="text" name="BUSINESSAREA"/>-->
</div> <!-- </li>-->
</form> <!-- <li>-->
</div> <!-- <label>城市：</label>-->
<!-- <input type="text" name="CITY"/>-->
<!-- </li>-->
<!-- <li>-->
<!-- <label>扩展：</label>-->
<!-- <input type="text" name="EXTID"/>-->
<!-- </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"> <div class="btn-group-sm" id="toolbar" role="group">
<!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="activity:record:add">--> <!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="activity:record:add">-->
<!-- <i class="fa fa-plus"></i> 添加--> <!-- <i class="fa fa-plus"></i> 添加-->
<!-- </a>--> <!-- </a>-->
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="activity:record:edit">--> <!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="activity:record:edit">-->
<!-- <i class="fa fa-edit"></i> 修改--> <!-- <i class="fa fa-edit"></i> 修改-->
<!-- </a>--> <!-- </a>-->
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="activity:record:remove">--> <!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="activity:record:remove">-->
<!-- <i class="fa fa-remove"></i> 删除--> <!-- <i class="fa fa-remove"></i> 删除-->
<!-- </a>--> <!-- </a>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="activity:record:export"> <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="activity:record:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div>
</div> </div>
</div> </div>
<th:block th:include="include :: footer" /> </div>
<script th:inline="javascript"> <th:block th:include="include :: footer"/>
var editFlag = [[${@permission.hasPermi('activity:record:edit')}]]; <script th:inline="javascript">
var removeFlag = [[${@permission.hasPermi('activity:record:remove')}]]; var editFlag = [[${@permission.hasPermi('activity:record:edit')}]];
var prefix = ctx + "activity/award/record"; var removeFlag = [[${@permission.hasPermi('activity:record:remove')}]];
var datas = [[${@dict.getType('prizeLevel')}]]; var prefix = ctx + "activity/award/record";
var prizetypes = [[${@dict.getType('prizeType')}]]; var datas = [[${@dict.getType('prizeLevel')}]];
var prizetypes = [[${@dict.getType('prizeType')}]];
var drawResults = [[${@dict.getType('drawResult')}]];
var drawInfoList = [[${@drawInfo.findDrawInfoList()}]];
var drawPrizeList = [[${@drawPrize.findDrawPrizeInfoList()}]];
$(function() { $(function () {
var options = { var options = {
url: prefix + "/list", url: prefix + "/list",
createUrl: prefix + "/add", createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}", updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
modalName: "记录发奖信息", modalName: "记录发奖信息",
columns: [{ columns: [{
checkbox: true checkbox: true
}, },
{ {
field: 'awardrecordid', field: 'awardrecordid',
title: '主键', title: '主键',
visible: false visible: false
}, },
{
field: 'drawcode',
title: '抽奖活动代码'
},
{
field: 'prizecode',
title: '奖品代码'
},
{ {
field: 'userid', field: 'userid',
title: '用户标识' title: '用户标识'
}, },
{ {
field: 'drawrecordid', field: 'username',
title: '抽奖记录标识' title: '用户名'
},
{
field: 'drawcode',
title: '活动名称',
formatter: function (value, row, index) {
return $.table.selectDrawname(drawInfoList, value);
}
},
{
field: 'prizecode',
title: '奖品名称',
formatter: function (value, row, index) {
return $.table.selectprivename(drawPrizeList, value);
}
},
{
field: 'prizetype',
title: '奖品类型',
formatter: function (value, row, index) {
return $.table.selectDictLabel(prizetypes, value);
}
},
{
field: 'awardresult',
title: '发奖结果',
formatter: function (value, row, index) {
return $.table.selectDictLabel(drawResults, value);
}
}, },
{ {
field: 'awardtime', field: 'awardtime',
title: '发奖时间' title: '发奖时间'
}, },
{
field: 'awardresult',
title: '发奖结果'
},
{
field: 'returncode',
title: '错误码'
},
{
field: 'returnmessage',
title: '错误信息'
},
{ {
field: 'phone', field: 'phone',
title: '手机号' title: '手机号'
@ -189,9 +216,22 @@
title: '地址' title: '地址'
}, },
{ {
field: 'username', field: 'drawrecordid',
title: '用户名' title: '抽奖记录标识',
visible: false
}, },
{
field: 'returncode',
title: '错误码',
visible: false
},
{
field: 'returnmessage',
title: '错误信息',
visible: false
},
// { // {
// field: 'createtimestamp', // field: 'createtimestamp',
// title: '创建时间' // title: '创建时间'
@ -202,50 +242,53 @@
// }, // },
{ {
field: 'drawtranseqno', field: 'drawtranseqno',
title: '抽奖流水' title: '抽奖流水',
visible: false
}, },
{ {
field: 'awardtranseqno', field: 'awardtranseqno',
title: '发奖流水' title: '发奖流水',
visible: false
}, },
{ {
field: 'prizelevel', field: 'prizelevel',
title: '奖品等级', title: '奖品等级',
formatter: function(value, row, index) { visible: false,
formatter: function (value, row, index) {
return $.table.selectDictLabel(datas, value); return $.table.selectDictLabel(datas, value);
} }
}, },
{ {
field: 'prizetype', field: 'merchantcode',
title: '奖品类型', title: '商户号',
formatter: function(value, row, index) { visible: false
return $.table.selectDictLabel(prizetypes, value); },
} {
field: 'merchantsyscode',
title: '商户系统号',
visible: false
},
{
field: 'channel',
title: '渠道',
visible: false
},
{
field: 'businessarea',
title: '业务领域',
visible: false
}, },
// {
// field: 'merchantcode',
// title: '商户号'
// },
// {
// field: 'merchantsyscode',
// title: '商户系统号'
// },
// {
// field: 'channel',
// title: '渠道'
// },
// {
// field: 'businessarea',
// title: '业务领域'
// },
{ {
field: 'city', field: 'city',
title: '城市' title: '城市',
visible: false
},
{
field: 'extid',
title: '扩展',
visible: false
}, },
// {
// field: 'extid',
// title: '扩展'
// },
// { // {
// title: '操作', // title: '操作',
// align: 'center', // align: 'center',
@ -256,10 +299,10 @@
// return actions.join(''); // return actions.join('');
// } // }
// } // }
] ]
}; };
$.table.init(options); $.table.init(options);
}); });
</script> </script>
</body> </body>
</html> </html>

234
sino-activity/src/main/resources/templates/activity/consume/consume.html
View File

@ -1,100 +1,111 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('抽奖次数消费信息列表')" /> <th:block th:include="include :: header('抽奖次数消费信息列表')"/>
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 search-collapse"> <div class="col-sm-12 search-collapse">
<form id="formId"> <form id="formId">
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li> <li>
<label>活动代码：</label> <label>活动名称：</label>
<input type="text" name="DRAWCODE"/> <!-- <input type="text" name="DRAWCODE"/>-->
</li> <select name="DRAWCODE" th:with="drawinfo=${@drawInfo.findDrawInfoList()}">
<li> <option value="">所有</option>
<label>任务流水：</label> <option th:each="drawInfo : ${drawinfo}" th:text="${drawInfo.DRAWNAME}"
<input type="text" name="TASKID"/> th:value="${drawInfo.DRAWCODE}"></option>
</li> </select>
<!-- <li>--> </li>
<!-- <label>用户标识：</label>--> <li>
<!-- <input type="text" name="USERID"/>--> <label>任务流水：</label>
<!-- </li>--> <input type="text" name="TASKID"/>
<li> </li>
<label>次数类型：</label> <li>
<select name="TYPE" th:with="type=${@dict.getType('drawType')}"> <label>用户标识：</label>
<option value="">所有</option> <input type="text" name="USERID"/>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> </li>
</select> <li>
</li> <label>次数类型：</label>
<!-- <li>--> <select name="TYPE" th:with="type=${@dict.getType('drawType')}" style="width: 80px">
<!-- <label>使用次数：</label>--> <option value="">所有</option>
<!-- <input type="text" name="CONSUMENUMBER"/>--> <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
<!-- </li>--> th:value="${dict.dictValue}"></option>
<!-- <li>--> </select>
<!-- <label>使用流水：</label>--> </li>
<!-- <input type="text" name="TRANSEQNO"/>--> <!-- <li>-->
<!-- </li>--> <!-- <label>使用次数：</label>-->
<!-- <li>--> <!-- <input type="text" name="CONSUMENUMBER"/>-->
<!-- <label>使用主键：</label>--> <!-- </li>-->
<!-- <input type="text" name="TRADEORDERID"/>--> <!-- <li>-->
<!-- </li>--> <!-- <label>使用流水：</label>-->
<li> <!-- <input type="text" name="TRANSEQNO"/>-->
<label>状态：</label> <!-- </li>-->
<select name="STATE" th:with="type=${@dict.getType('status')}"> <!-- <li>-->
<option value="">所有</option> <!-- <label>使用主键：</label>-->
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <!-- <input type="text" name="TRADEORDERID"/>-->
</select> <!-- </li>-->
</li> <li>
<li> <label>状态：</label>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a> <select name="STATE" th:with="type=${@dict.getType('status')}" style="width: 80px">
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a> <option value="">所有</option>
</li> <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
</ul> th:value="${dict.dictValue}"></option>
</div> </select>
</form> </li>
</div> <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"> <div class="btn-group-sm" id="toolbar" role="group">
<!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="activity:consume:add">--> <!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="activity:consume:add">-->
<!-- <i class="fa fa-plus"></i> 添加--> <!-- <i class="fa fa-plus"></i> 添加-->
<!-- </a>--> <!-- </a>-->
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="activity:consume:edit">--> <!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="activity:consume:edit">-->
<!-- <i class="fa fa-edit"></i> 修改--> <!-- <i class="fa fa-edit"></i> 修改-->
<!-- </a>--> <!-- </a>-->
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="activity:consume:remove">--> <!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="activity:consume:remove">-->
<!-- <i class="fa fa-remove"></i> 删除--> <!-- <i class="fa fa-remove"></i> 删除-->
<!-- </a>--> <!-- </a>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="activity:consume:export"> <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="activity:consume:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div>
</div> </div>
</div> </div>
<th:block th:include="include :: footer" /> </div>
<script th:inline="javascript"> <th:block th:include="include :: footer"/>
var editFlag = [[${@permission.hasPermi('activity:consume:edit')}]]; <script th:inline="javascript">
var removeFlag = [[${@permission.hasPermi('activity:consume:remove')}]]; var editFlag = [[${@permission.hasPermi('activity:consume:edit')}]];
var prefix = ctx + "activity/consume"; var removeFlag = [[${@permission.hasPermi('activity:consume:remove')}]];
var drawTypes = [[${@dict.getType('drawType')}]]; var prefix = ctx + "activity/consume";
var STATEDatas = [[${@dict.getType('status')}]]; 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', field: 'taskconsumeid',
title: '业务主键', title: '业务主键',
@ -102,51 +113,56 @@
}, },
{ {
field: 'tasknotifyid', field: 'tasknotifyid',
title: '活动次数记录主键' title: '活动次数记录主键',
}, visible: false
{
field: 'drawcode',
title: '活动代码'
},
{
field: 'taskid',
title: '任务流水'
}, },
{ {
field: 'userid', field: 'userid',
title: '用户标识' title: '用户标识'
}, },
{
field: 'drawcode',
title: '活动名称',
formatter: function (value, row, index) {
return $.table.selectDrawname(drawInfoList, value);
}
},
{ {
field: 'type', field: 'type',
title: '赠送次数类型', title: '赠送次数类型',
formatter: function(value, row, index) { formatter: function (value, row, index) {
return $.table.selectDictLabel(drawTypes, value); return $.table.selectDictLabel(drawTypes, value);
} }
}, },
{
field: 'createtimestamp',
title: '创建时间'
},
{ {
field: 'consumenumber', field: 'consumenumber',
title: '使用次数' title: '使用次数'
}, },
{
field: 'taskid',
title: '任务流水'
},
{ {
field: 'transeqno', field: 'transeqno',
title: '使用流水' title: '使用流水'
}, },
{ {
field: 'tradeorderid', field: 'tradeorderid',
title: '使用主键' title: '使用主键',
visible: false
}, },
{ {
field: 'state', field: 'state',
title: '状态', title: '状态',
formatter: function(value, row, index) { formatter: function (value, row, index) {
return $.table.selectDictLabel(STATEDatas, value); return $.table.selectDictLabel(STATEDatas, value);
} }
}, },
// { // {
// field: 'createtimestamp',
// title: '创建时间'
// },
// {
// field: 'lastupdatetimestamp', // field: 'lastupdatetimestamp',
// title: '最后修改时间' // title: '最后修改时间'
// }, // },
@ -160,10 +176,10 @@
// return actions.join(''); // return actions.join('');
// } // }
// } // }
] ]
}; };
$.table.init(options); $.table.init(options);
}); });
</script> </script>
</body> </body>
</html> </html>

35
sino-activity/src/main/resources/templates/activity/prizeInfo/info.html
View File

@ -11,24 +11,24 @@
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li> <li>
<label>奖品代码：</label> <label>奖品名称：</label>
<input type="text" name="PRIZECODE"/> <input type="text" name="PRIZECODE"/>
</li> </li>
<li> <li>
<label>奖品名称：</label> <label>奖品名称：</label>
<input type="text" name="PRIZENAME"/> <input type="text" name="PRIZENAME"/>
</li> </li>
<li>
<label>奖品面额：</label>
<input type="text" name="PRIZEVALUE"/>
</li>
<li> <li>
<label>奖品类型：</label> <label>奖品类型：</label>
<select name="PRIZETYPE" th:with="type=${@dict.getType('prizeType')}"> <select name="PRIZETYPE" th:with="type=${@dict.getType('prizeType')}" style="width: 100px">
<option value="">所有</option> <option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li>
<label>奖品面额：</label>
<input type="text" name="PRIZEVALUE"/>
</li>
<!-- <li>--> <!-- <li>-->
<!-- <label>创建时间：</label>--> <!-- <label>创建时间：</label>-->
<!-- <input type="text" class="time-input" placeholder="请选择创建时间" name="CREATETIMESTAMP"/>--> <!-- <input type="text" class="time-input" placeholder="请选择创建时间" name="CREATETIMESTAMP"/>-->
@ -39,7 +39,7 @@
<!-- </li>--> <!-- </li>-->
<li> <li>
<label>状态：</label> <label>状态：</label>
<select name="STATUS" th:with="type=${@dict.getType('status')}"> <select name="STATUS" th:with="type=${@dict.getType('status')}" style="width: 80px">
<option value="">所有</option> <option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
@ -142,16 +142,17 @@
field: 'integralprojectcode', field: 'integralprojectcode',
title: '积分项目编码' title: '积分项目编码'
}, },
{ // {
title: '操作', // title: '操作',
align: 'center', // align: 'center',
formatter: function(value, row, index) { // formatter: function(value, row, index) {
var actions = []; // var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.prizeid + '\')"><i class="fa fa-edit"></i>编辑</a> '); // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.prizeid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.prizeid + '\')"><i class="fa fa-remove"></i>删除</a>'); // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.prizeid + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join(''); // return actions.join('');
} // }
}] // }
]
}; };
$.table.init(options); $.table.init(options);
}); });

2
sino-activity/src/main/resources/templates/activity/record/add.html
View File

@ -41,7 +41,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">奖品代码：</label> <label class="col-sm-3 control-label">奖品名称：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="PRIZECODE" class="form-control" type="text"> <input name="PRIZECODE" class="form-control" type="text">
</div> </div>

2
sino-activity/src/main/resources/templates/activity/record/edit.html
View File

@ -42,7 +42,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">奖品代码：</label> <label class="col-sm-3 control-label">奖品名称：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="PRIZECODE" th:field="*{PRIZECODE}" class="form-control" type="text"> <input name="PRIZECODE" th:field="*{PRIZECODE}" class="form-control" type="text">
</div> </div>

343
sino-activity/src/main/resources/templates/activity/record/record.html
View File

@ -1,171 +1,215 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('抽奖记录信息列表')" /> <th:block th:include="include :: header('抽奖记录信息列表')"/>
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 search-collapse"> <div class="col-sm-12 search-collapse">
<form id="formId"> <form id="formId">
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li> <!-- <li>-->
<label>抽奖流水：</label> <!-- <label>抽奖流水：</label>-->
<input type="text" name="DRAWTRANSEQNO"/> <!-- <input type="text" name="DRAWTRANSEQNO"/>-->
</li> <!-- </li>-->
<li> <li>
<label>活动代码：</label> <label>活动名称：</label>
<input type="text" name="DRAWCODE"/> <select name="DRAWCODE" th:with="drawinfo=${@drawInfo.findDrawInfoList()}">
</li> <option value="">所有</option>
<!-- <li>--> <option th:each="drawInfo : ${drawinfo}" th:text="${drawInfo.DRAWNAME}"
<!-- <label>用户标识：</label>--> th:value="${drawInfo.DRAWCODE}"></option>
<!-- <input type="text" name="USERID"/>--> </select>
<!-- </li>--> </li>
<!-- <li>--> <li>
<!-- <label>抽奖时间：</label>--> <label>用户标识：</label>
<!-- <input type="text" class="time-input" placeholder="请选择抽奖时间" name="DRAWTIME"/>--> <input type="text" name="USERID"/>
<!-- </li>--> </li>
<li> <!-- <li>-->
<label>抽奖结果：</label> <!-- <label>抽奖时间：</label>-->
<input type="text" name="DRAWRESULT"/> <!-- <input type="text" class="time-input" placeholder="请选择抽奖时间" name="DRAWTIME"/>-->
</li> <!-- </li>-->
<li> <li>
<label>奖品代码：</label> <label>抽奖结果：</label>
<input type="text" name="PRIZECODE"/> <select name="DRAWRESULT" th:with="type=${@dict.getType('drawResult')}" style="width: 80px">
</li> <option value="">所有</option>
<li> <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
<label>奖品类型：</label> th:value="${dict.dictValue}"></option>
<select name="PRIZETYPE" th:with="type=${@dict.getType('prizeType')}"> </select>
<option value="">所有</option> </li>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <li>
</select> <label>奖品名称：</label>
</li> <select name="PRIZECODE" th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}">
<!-- <li>--> <option value="">所有</option>
<!-- <label>账务日期：</label>--> <option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
<!-- <input type="text" class="time-input" placeholder="请选择账务日期" name="CHECKINGDATE"/>--> th:value="${drawPrize.PRIZECODE}"></option>
<!-- </li>--> </select>
<!-- <li>--> </li>
<!-- <label>创建时间：</label>--> <li>
<!-- <input type="text" class="time-input" placeholder="请选择创建时间" name="CREATETIMESTAMP"/>--> <label>用户名：</label>
<!-- </li>--> <input type="text" name="USERNAME"/>
<!-- <li>--> </li>
<!-- <label>最后修改时间：</label>--> <!-- <li>-->
<!-- <input type="text" class="time-input" placeholder="请选择最后修改时间" name="LASTUPDATETIMESTAMP"/>--> <!-- <label>奖品类型：</label>-->
<!-- </li>--> <!-- <select name="PRIZETYPE" th:with="type=${@dict.getType('prizeType')}" style="width: 100px">-->
<!-- <li>--> <!-- <option value="">所有</option>-->
<!-- <label>渠道：</label>--> <!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}"-->
<!-- <input type="text" name="CHANNEL"/>--> <!-- th:value="${dict.dictValue}"></option>-->
<!-- </li>--> <!-- </select>-->
<li> <!-- </li>-->
<label>用户名：</label> <!-- <li>-->
<input type="text" name="USERNAME"/> <!-- <label>账务日期：</label>-->
</li> <!-- <input type="text" class="time-input" placeholder="请选择账务日期" name="CHECKINGDATE"/>-->
<li> <!-- </li>-->
<label>奖品等级：</label> <!-- <li>-->
<select name="PRIZELEVEL" th:with="type=${@dict.getType('prizeLevel')}"> <!-- <label>创建时间：</label>-->
<option value="">所有</option> <!-- <input type="text" class="time-input" placeholder="请选择创建时间" name="CREATETIMESTAMP"/>-->
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <!-- </li>-->
</select> <!-- <li>-->
</li> <!-- <label>最后修改时间：</label>-->
<!-- <li>--> <!-- <input type="text" class="time-input" placeholder="请选择最后修改时间" name="LASTUPDATETIMESTAMP"/>-->
<!-- <label>奖品项目编码：</label>--> <!-- </li>-->
<!-- <input type="text" name="PROJECTCODE"/>--> <!-- <li>-->
<!-- </li>--> <!-- <label>渠道：</label>-->
<!-- <li>--> <!-- <input type="text" name="CHANNEL"/>-->
<!-- <label>请求来源：</label>--> <!-- </li>-->
<!-- <input type="text" name="SOURCE"/>--> <!-- <li>-->
<!-- </li>--> <!-- <label>奖品等级：</label>-->
<li> <!-- <select name="PRIZELEVEL" th:with="type=${@dict.getType('prizeLevel')}" style="width: 80px">-->
<label>手机号：</label> <!-- <option value="">所有</option>-->
<input type="text" name="PHONE"/> <!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}"-->
</li> <!-- th:value="${dict.dictValue}"></option>-->
<li> <!-- </select>-->
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a> <!-- </li>-->
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a> <!-- <li>-->
</li> <!-- <label>奖品项目编码：</label>-->
</ul> <!-- <input type="text" name="PROJECTCODE"/>-->
</div> <!-- </li>-->
</form> <!-- <li>-->
</div> <!-- <label>请求来源：</label>-->
<!-- <input type="text" name="SOURCE"/>-->
<!-- </li>-->
<li>
<label>手机号：</label>
<input type="text" name="PHONE"/>
</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"> <div class="btn-group-sm" id="toolbar" role="group">
<!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="activity:record:add">--> <!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="activity:record:add">-->
<!-- <i class="fa fa-plus"></i> 添加--> <!-- <i class="fa fa-plus"></i> 添加-->
<!-- </a>--> <!-- </a>-->
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="activity:record:edit">--> <!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="activity:record:edit">-->
<!-- <i class="fa fa-edit"></i> 修改--> <!-- <i class="fa fa-edit"></i> 修改-->
<!-- </a>--> <!-- </a>-->
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="activity:record:remove">--> <!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="activity:record:remove">-->
<!-- <i class="fa fa-remove"></i> 删除--> <!-- <i class="fa fa-remove"></i> 删除-->
<!-- </a>--> <!-- </a>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="activity:record:export"> <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="activity:record:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div>
</div> </div>
</div> </div>
<th:block th:include="include :: footer" /> </div>
<script th:inline="javascript"> <th:block th:include="include :: footer"/>
var editFlag = [[${@permission.hasPermi('activity:record:edit')}]]; <script th:inline="javascript">
var removeFlag = [[${@permission.hasPermi('activity:record:remove')}]]; var editFlag = [[${@permission.hasPermi('activity:record:edit')}]];
var prefix = ctx + "activity/record"; var removeFlag = [[${@permission.hasPermi('activity:record:remove')}]];
var datas = [[${@dict.getType('prizeLevel')}]]; var prefix = ctx + "activity/record";
var prizetypes = [[${@dict.getType('prizeType')}]]; var datas = [[${@dict.getType('prizeLevel')}]];
var prizetypes = [[${@dict.getType('prizeType')}]];
var drawResults = [[${@dict.getType('drawResult')}]];
var drawInfoList = [[${@drawInfo.findDrawInfoList()}]];
var drawPrizeList = [[${@drawPrize.findDrawPrizeInfoList()}]];
$(function() { $(function () {
var options = { var options = {
url: prefix + "/list", url: prefix + "/list",
createUrl: prefix + "/add", createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}", updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
modalName: "抽奖记录信息", modalName: "抽奖记录信息",
columns: [{ columns: [{
checkbox: true checkbox: true
}, },
{ {
field: 'drawrecordid', field: 'drawrecordid',
title: '主键', title: '主键',
visible: false visible: false
}, },
{ {
field: 'drawtranseqno', field: 'userid',
title: '抽奖流水' title: '用户标识'
},
{
field: 'username',
title: '用户名'
},
{
field: 'phone',
title: '手机号'
}, },
{ {
field: 'drawcode', field: 'drawcode',
title: '抽奖活动代码' title: '活动名称',
formatter: function (value, row, index) {
return $.table.selectDrawname(drawInfoList, value);
}
}, },
{ {
field: 'userid', field: 'drawresult',
title: '用户标识' title: '抽奖结果',
formatter: function (value, row, index) {
return $.table.selectDictLabel(drawResults, value);
}
},
{
field: 'prizecode',
title: '奖品名称',
formatter: function (value, row, index) {
return $.table.selectprivename(drawPrizeList, value);
}
}, },
{ {
field: 'DRAWTIME', field: 'DRAWTIME',
title: '抽奖时间' title: '抽奖时间'
}, },
{ {
field: 'drawresult', field: 'drawtranseqno',
title: '抽奖结果' title: '抽奖流水',
visible: false
}, },
{ {
field: 'prizecode', field: 'projectcode',
title: '奖品代码' title: '奖品项目编码',
visible: false
}, },
{ {
field: 'prizetype', field: 'prizetype',
title: '奖品类型', title: '奖品类型',
formatter: function(value, row, index) { visible: false,
formatter: function (value, row, index) {
return $.table.selectDictLabel(prizetypes, value); return $.table.selectDictLabel(prizetypes, value);
} }
}, },
{ {
field: 'CHECKINGDATE', field: 'CHECKINGDATE',
title: '账务日期' title: '账务日期',
visible: false
}, },
// { // {
// field: 'CREATETIMESTAMP', // field: 'CREATETIMESTAMP',
@ -177,34 +221,29 @@
// }, // },
{ {
field: 'channel', field: 'channel',
title: '渠道' title: '渠道',
}, visible: false,
{
field: 'username',
title: '用户名'
}, },
{ {
field: 'prizelevel', field: 'prizelevel',
title: '奖品等级', title: '奖品等级',
formatter: function(value, row, index) { visible: false,
formatter: function (value, row, index) {
return $.table.selectDictLabel(datas, value); return $.table.selectDictLabel(datas, value);
} }
}, },
{
field: 'projectcode',
title: '奖品项目编码'
},
{ {
field: 'source', field: 'source',
title: '请求来源' title: '请求来源',
}, visible: false
{
field: 'phone',
title: '手机号'
}, },
{ {
field: 'extarea', field: 'extarea',
title: '扩展域' title: '扩展域',
visible: false
}, },
// { // {
// title: '操作', // title: '操作',
@ -216,10 +255,10 @@
// return actions.join(''); // return actions.join('');
// } // }
// } // }
] ]
}; };
$.table.init(options); $.table.init(options);
}); });
</script> </script>
</body> </body>
</html> </html>