积分模块
diff --git a/payapi/src/main/resources/application.properties b/payapi/src/main/resources/application.properties
index 091b5cf..0881a1c 100644
--- a/payapi/src/main/resources/application.properties
+++ b/payapi/src/main/resources/application.properties
@@ -36,9 +36,11 @@
payapi.sourcetype.checker.scheduler=7 3/10 * * * ?
citizencard.dolosstask.cron=-
send.delay.notice.task.cron=29 0/1 * * * ?
+points.outdate.cron=0 0 0 * * ?
+points.consume.cron=0 0 0 * * ?
################################################
# user password
auth.password.bcrypt.length=10
###################################################
spring.redis.database=0
-multi-tenant.datasource.base-package=com.supwisdom.dlpay
\ No newline at end of file
+multi-tenant.datasource.base-package=com.supwisdom.dlpay
diff --git a/payapi/src/main/resources/templates/index.html b/payapi/src/main/resources/templates/index.html
index 302af3a..fb17475 100755
--- a/payapi/src/main/resources/templates/index.html
+++ b/payapi/src/main/resources/templates/index.html
@@ -162,4 +162,4 @@
</script>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/payapi/src/main/resources/templates/system/level/pointsactiveadd.html b/payapi/src/main/resources/templates/system/level/pointsactiveadd.html
index 16eed53..3a5a4d5 100644
--- a/payapi/src/main/resources/templates/system/level/pointsactiveadd.html
+++ b/payapi/src/main/resources/templates/system/level/pointsactiveadd.html
@@ -91,18 +91,22 @@
laydate.render({
elem: '#start-date-value' //指定元素
,format: 'yyyy年MM月dd日'
+ ,trigger: 'click'
});
laydate.render({
elem: '#end-date-value' //指定元素
,format: 'yyyy年MM月dd日'
+ ,trigger: 'click'
});
laydate.render({
elem: '#year-start-value' //指定元素
,format: 'MM月dd日'
+ ,trigger: 'click'
});
laydate.render({
elem: '#year-end-value' //指定元素
,format: 'MM月dd日'
+ ,trigger: 'click'
});
var url = '[[@{/pointsActive/add}]]';
form.render('radio');
diff --git a/payapi/src/main/resources/templates/system/level/pointsactiveindex.html b/payapi/src/main/resources/templates/system/level/pointsactiveindex.html
index 88d7d54..0c1806a 100644
--- a/payapi/src/main/resources/templates/system/level/pointsactiveindex.html
+++ b/payapi/src/main/resources/templates/system/level/pointsactiveindex.html
@@ -9,21 +9,21 @@
<div class="layui-card-body">
<div class="layui-form toolbar">
活动日名称：
- <input id="search-chkstatus-searchkey" class="layui-input search-input" type="text"
+ <input id="search-chkstatus-type" class="layui-input search-input" type="text"
maxlength="20"/> 
<div style="display: inline;width: 200px" id="type-value" class="layui-form toolbar">
循环方式：
- <select id="shop-manager-search-status">
+ <select id="shop-manager-search-type">
<option value=""> 全部</option>
<option value="no">不循环</option>
<option value="month">月循环</option>
<option value="year">年循环</option>
</select>
</div>
- <button id="btn-chkstatus-search" class="layui-btn icon-btn" data-type="search"><i
+ <button id="btn-chkstatus-type" class="layui-btn icon-btn" data-type="search"><i
class="layui-icon"></i>搜索
</button>
- <button id="btn-reset-sysparam" class="layui-btn layui-btn-primary" data-type="reset"><i
+ <button id="btn-reset-type" class="layui-btn layui-btn-primary" data-type="reset"><i
class="layui-icon"></i>清 空
</button>
<div style="color: red;margin-top: 10px">
@@ -104,15 +104,15 @@
});
// 搜索按钮点击事件
- $('#btn-chkstatus-search').click(function () {
- var name = $("#search-chkstatus-searchkey").val();
- var type = $("#shop-manager-search-status").val();
+ $('#btn-chkstatus-type').click(function () {
+ var name = $("#search-chkstatus-type").val();
+ var type = $("#shop-manager-search-type").val();
table.reload('pointsActiveTable', {where: {name: name, type: type}});
});
- $('#btn-reset-sysparam').click(function () {
- $("#search-chkstatus-searchkey").val("");
- $('#shop-manager-search-status option:selected').val("");
+ $('#btn-reset-type').click(function () {
+ $("#search-chkstatus-type").val("");
+ $('#shop-manager-search-type option:selected').val("");
});
// 工具条点击事件
diff --git a/payapi/src/main/resources/templates/system/level/pointsreport.html b/payapi/src/main/resources/templates/system/level/pointsreport.html
index 76a5ece..aa84fd1 100644
--- a/payapi/src/main/resources/templates/system/level/pointsreport.html
+++ b/payapi/src/main/resources/templates/system/level/pointsreport.html
@@ -11,13 +11,13 @@
<div class="layui-inline" style="margin-right: 20px">
<label class="layui-form-label">积分日期</label>
<div class="layui-input-inline" style="width: 120px;">
- <input type="text" name="startDate" id="startDate"
+ <input type="text" name="startDate" id="startDateReport"
placeholder="开始日期"
autocomplete="off" class="layui-input"/>
</div>
-
<div class="layui-input-inline" style="width: 120px;">
- <input type="text" name="endDate" id="endDate" placeholder="结束日期"
+ <input type="text" name="endDate" id="endDateReport" placeholder="结束日期"
autocomplete="off"
class="layui-input"/>
</div>
@@ -28,10 +28,10 @@
<option selected='selected' value=""> 全部</option>
</select>
</div>
- <button id="btn-chkstatus-search" class="layui-btn icon-btn" data-type="search"><i
+ <button id="btn-chkstatus-report" class="layui-btn icon-btn" data-type="search"><i
class="layui-icon"></i>搜索
</button>
- <button id="btn-reset-sysparam" class="layui-btn layui-btn-primary" data-type="reset"><i
+ <button id="btn-reset-report" class="layui-btn layui-btn-primary" data-type="reset"><i
class="layui-icon"></i>清 空
</button>
</div>
@@ -55,17 +55,19 @@
var table = layui.table;
var admin = layui.admin;
var laydate = layui.laydate;
-
+ let element = layui.element;
let init_date = new Date();
laydate.render({
- elem: '#startDate'
+ elem: '#startDateReport'
, format: 'yyyy年MM月dd日'
, value: init_date
+ ,trigger: 'click'
});
laydate.render({
- elem: '#endDate'
+ elem: '#endDateReport'
, format: 'yyyy年MM月dd日'
, value: init_date
+ ,trigger: 'click'
});
// 渲染表格
table.render({
@@ -104,16 +106,16 @@
});
// 搜索按钮点击事件
- $('#btn-chkstatus-search').click(function () {
+ $('#btn-chkstatus-report').click(function () {
let name = $("#points-name").val();
- let startDate = $("#startDate").val();
- let endDate = $("#endDate").val();
+ let startDate = $("#startDateReport").val();
+ let endDate = $("#endDateReport").val();
table.reload('pointsReportTable', {where: {name: name, startdate: startDate, enddate: endDate}});
});
- $('#btn-reset-sysparam').click(function () {
- $("#startDate").val("");
- $("#endDate").val("");
+ $('#btn-reset-report').click(function () {
+ $("#startDateReport").val("");
+ $("#endDateReport").val("");
});
let getPointsReportParam = function () {
@@ -137,7 +139,8 @@
$("#points-name").append('<option value="'+dataSet[i].dictval+'">'+dataSet[i].dicttypename+'</option>');
}
}
- form.render("select");
+ form.render();
+ element.init();
} else if (result.code === 401) {
layer.msg(result.msg, {icon: 2, time: 1500}, function () {
location.replace('[[@{/login}]]');
diff --git a/payapi/src/main/resources/templates/system/level/userpointsindex.html b/payapi/src/main/resources/templates/system/level/userpointsindex.html
index 0e98a3e..14a84f1 100644
--- a/payapi/src/main/resources/templates/system/level/userpointsindex.html
+++ b/payapi/src/main/resources/templates/system/level/userpointsindex.html
@@ -9,34 +9,38 @@
<div class="layui-card-body">
<div class="layui-form toolbar">
姓名：
- <input id="search-chkstatus-searchkey" class="layui-input search-input" type="text"
+ <input id="search-chkstatus-get" class="layui-input search-input" type="text"
maxlength="20"/> 
市民卡账号：
<input id="search-account" class="layui-input search-input" type="text" maxlength="20"/> 
积分名称：
- <select id="points-name">
+ <select id="points-name-select">
<option value=""> 全部</option>
- <option value="consume">消费获得</option>
- <option value="task">任务获得</option>
+ <option value="consume">消费积分</option>
+ <option value="outpoints">失效积分</option>
+ <option value="consumeDay">日累计奖励</option>
+ <option value="consumeMonth">月累计奖励</option>
+ <option value="task">日常任务积分</option>
+ <option value="consumeRefund">退款积分</option>
</select>
<div class="layui-inline">
<label class="layui-form-label">积分日期</label>
<div class="layui-input-inline" style="width: 120px;">
- <input type="text" name="startDate" id="startDate"
+ <input type="text" name="startDate" id="startDateSelect"
placeholder="开始日期"
autocomplete="off" class="layui-input"/>
</div>
-
<div class="layui-input-inline" style="width: 120px;">
- <input type="text" name="endDate" id="endDate" placeholder="结束日期"
+ <input type="text" name="endDate" id="endDateSelect" placeholder="结束日期"
autocomplete="off"
class="layui-input"/>
</div>
</div>
- <button id="btn-chkstatus-search" class="layui-btn icon-btn" data-type="search" style="margin-top: 10px"><i
+ <button id="btn-chkstatus-search-select" class="layui-btn icon-btn" data-type="search" style="margin-top: 10px"><i
class="layui-icon"></i>搜索
</button>
- <button id="btn-reset-sysparam" class="layui-btn layui-btn-primary" data-type="reset" style="margin-top: 10px"><i
+ <button id="btn-reset-sysparam-select" class="layui-btn layui-btn-primary" data-type="reset" style="margin-top: 10px"><i
class="layui-icon"></i>清 空
</button>
<div style="color: red;margin-top: 10px">查询无符合条件的记录,请重新输入查询条件!</div>
@@ -60,12 +64,14 @@
var laydate = layui.laydate;
form.render("select");
laydate.render({
- elem: '#startDate'
+ elem: '#startDateSelect'
,format: 'yyyy年MM月dd日'
+ ,trigger: 'click'
});
laydate.render({
- elem: '#endDate'
+ elem: '#endDateSelect'
,format: 'yyyy年MM月dd日'
+ ,trigger: 'click'
});
// 渲染表格
table.render({
@@ -122,7 +128,36 @@
title: '积分名称',
width: 140,
align: 'center',
- sort: true
+ sort: true,
+ templet: function (item) {
+ if(item.type=="consume"){
+ return "消费积分";
+ }
+ if(item.type=="outpoints"){
+ return "失效积分";
+ }
+ if(item.type=="consumeDay"){
+ return "日累计奖励";
+ }
+ if(item.type=="consumeMonth"){
+ return "月累计奖励"
+ }
+ if(item.type=="task"){
+ return "日常任务积分"
+ }
+ if(item.type=="consumeRefund"){
+ return "退款积分"
+ }
+ if(item.type=="consumeRefund"){
+ return "退款积分"
+ }
+ if(item.type=="consumeDayRefund"){
+ return "退款日累计奖励积分"
+ }
+ if(item.type=="consumeMonthRefund"){
+ return "退款月累计奖励积分"
+ }
+ }
},
{field: 'points', title: '获得积分', width: 130, align: 'center'},
{field: 'aftpoints', title: '目前可用积分', width: 160, align: 'center'},
@@ -132,20 +167,20 @@
});
// 搜索按钮点击事件
- $('#btn-chkstatus-search').click(function () {
- let name = $("#search-chkstatus-searchkey").val();
+ $('#btn-chkstatus-search-select').click(function () {
+ let name = $("#search-chkstatus-get").val();
let idno = $("#search-account").val();
- let startDate = $("#startDate").val();
- let endDate = $("#endDate").val();
- let pointsName = $("#points-name").val();
+ let startDate = $("#startDateSelect").val();
+ let endDate = $("#endDateSelect").val();
+ let pointsName = $("#points-name-select").val();
table.reload('userPointsTable', {where: {name: name, idno: idno,startDate:startDate,endDate:endDate,pointsName:pointsName}});
});
- $('#btn-reset-sysparam').click(function () {
- $("#search-chkstatus-searchkey").val("");
+ $('#btn-reset-sysparam-select').click(function () {
+ $("#search-chkstatus-get").val("");
$("#search-account").val("");
- $("#startDate").val("");
- $("#endDate").val("");
+ /* $("#startDateSelect").val("");
+ $("#endDateSelect").val("");*/
});
/* // 工具条点击事件