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

活动管理-抽奖活动管理修改内容

This commit is contained in:
xu0625 2021-03-31 14:55:13 +08:00
parent b656222e6c
commit 5548889329
14 changed files with 170 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sino-activity/src/main/java/com/sinosoft/activity/controller/DrawConfigController.java
View File

@ -5,8 +5,10 @@ import java.util.Date;
import java.util.List;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.sinosoft.activity.domain.DrawAwardRecord;
import com.sinosoft.activity.domain.DrawConfig;
import com.sinosoft.activity.domain.DrawPrizeInfo;
import com.sinosoft.activity.service.IDrawAwardRecordService;
import com.sinosoft.activity.service.IDrawConfigService;
import com.sinosoft.activity.service.IDrawPrizeInfoService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -42,6 +44,8 @@ public class DrawConfigController extends BaseController
@Autowired
private IDrawPrizeInfoService iDrawPrizeInfoService;
@Autowired
private IDrawAwardRecordService iDrawAwardRecordService;
@RequiresPermissions("activity:config:view")
@GetMapping()
public String config()
@ -102,11 +106,13 @@ public class DrawConfigController extends BaseController
/**
* 修改存储奖项配置信息
*/
@GetMapping("/edit/{DRAWCONFIGID}")
public String edit(@PathVariable("DRAWCONFIGID") String DRAWCONFIGID, ModelMap mmap)
@GetMapping("/edit/{DRAWCONFIGID}/{PRIZECODE}/{DRAWCODE}")
public String edit(@PathVariable("DRAWCONFIGID") String DRAWCONFIGID,@PathVariable("PRIZECODE") String PRIZECODE ,@PathVariable("DRAWCODE") String DRAWCODE ,ModelMap mmap)
{
DrawConfig drawConfig = drawConfigService.selectDrawConfigById(DRAWCONFIGID);
DrawAwardRecord drawAwardRecord = iDrawAwardRecordService.selectDrawAwardRecordCount(DRAWCODE, PRIZECODE);
mmap.put("drawConfig", drawConfig);
mmap.put("count", drawAwardRecord.getCount());
return prefix + "/configEdit";
}

10
sino-activity/src/main/java/com/sinosoft/activity/domain/DrawAwardRecord.java
View File

@ -115,6 +115,16 @@ public class DrawAwardRecord extends BaseEntity
@Excel(name = "扩展")
private String EXTID;
private Integer count;
public Integer getCount() {
return count;
}
public void setCount(Integer count) {
this.count = count;
}
public void setAWARDRECORDID(String AWARDRECORDID)
{
this.AWARDRECORDID = AWARDRECORDID;

8
sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawAwardRecordMapper.java
View File

@ -58,4 +58,12 @@ public interface DrawAwardRecordMapper
* @return 结果
*/
public int deleteDrawAwardRecordByIds(String[] AWARDRECORDIDs);
/**
* 获取已发放奖品数量
* @param drawAwardRecord
* @return
*/
public DrawAwardRecord selectDrawAwardRecordCount(DrawAwardRecord drawAwardRecord);
}

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

@ -58,4 +58,11 @@ public interface IDrawAwardRecordService
* @return 结果
*/
public int deleteDrawAwardRecordById(String AWARDRECORDID);
/**
* 获取已发放奖品数量
* @param DRAWCODE
* @param prizecode
*/
public DrawAwardRecord selectDrawAwardRecordCount(String DRAWCODE, String prizecode);
}

2
sino-activity/src/main/java/com/sinosoft/activity/service/IDrawRuleService.java
View File

@ -8,7 +8,7 @@ import java.util.List;
/**
* 存储抽奖特殊规则对象Service接口
*
* @author ruoyi
* @author xlh
* @date 2021-03-25
*/
public interface IDrawRuleService

13
sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawAwardRecordServiceImpl.java
View File

@ -91,4 +91,17 @@ public class DrawAwardRecordServiceImpl implements IDrawAwardRecordService
{
return drawAwardRecordMapper.deleteDrawAwardRecordById(AWARDRECORDID);
}
/**
* 获取已发放奖品数量
* @param DRAWCODE
* @param prizecode
*/
@Override
public DrawAwardRecord selectDrawAwardRecordCount(String DRAWCODE, String prizecode) {
DrawAwardRecord drawAwardRecord = new DrawAwardRecord();
drawAwardRecord.setDRAWCODE(DRAWCODE);
drawAwardRecord.setPRIZECODE(prizecode);
return drawAwardRecordMapper.selectDrawAwardRecordCount(drawAwardRecord);
}
}

2
sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawRuleServiceImpl.java
View File

@ -13,7 +13,7 @@ import com.ruoyi.common.core.text.Convert;
/**
* 抽奖活动管理对象Service业务层处理
*
* @author ruoyi
* @author xlh
* @date 2021-03-25
*/
@Service

11
sino-activity/src/main/resources/mapper/activity/DrawAwardRecordMapper.xml
View File

@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="BUSINESSAREA" column="BUSINESSAREA" />
<result property="CITY" column="CITY" />
<result property="EXTID" column="EXTID" />
<result property="count" column="count" />
</resultMap>
<sql id="selectDrawAwardRecordVo">
@ -166,4 +167,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
<select id="selectDrawAwardRecordCount" parameterType="DrawAwardRecord" resultMap="DrawAwardRecordResult">
SELECT
COUNT(1) AS count
FROM
draw_award_record a
WHERE
a.DRAWCODE = #{DRAWCODE}
AND a.PRIZECODE = #{PRIZECODE}
AND AWARDRESULT = '1'
</select>
</mapper>

52
sino-activity/src/main/resources/templates/activity/info/add.html
View File

@ -54,7 +54,7 @@
<label class="col-sm-4 control-label is-required">开始时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="STARTTIME" class="form-control" placeholder="yyyy-MM-dd" type="text">
<input name="STARTTIME" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
@ -65,7 +65,7 @@
<label class="col-sm-4 control-label is-required">结束时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="ENDTIME" class="form-control" placeholder="yyyy-MM-dd" type="text">
<input name="ENDTIME" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
@ -121,7 +121,7 @@
<label class="col-sm-4 control-label is-required">抽奖限制开始时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="DAILYSTARTTIME" class="form-control" placeholder="yyyy-MM-dd" type="text">
<input name="DAILYSTARTTIME" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
@ -132,7 +132,7 @@
<label class="col-sm-4 control-label is-required">抽奖限制结束时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="DAILYENDTIME" class="form-control" placeholder="yyyy-MM-dd" type="text">
<input name="DAILYENDTIME" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
@ -221,27 +221,47 @@
$("input[name='STARTTIME']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
weekStart: 1,
todayBtn: 1,
autoclose: 1,
todayHighlight: 1,
startView: 2,
forceParse: 0,
showMeridian: 1,
format: 'yyyy-mm-dd hh:ii:ss'
});
$("input[name='ENDTIME']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
weekStart: 1,
todayBtn: 1,
autoclose: 1,
todayHighlight: 1,
startView: 2,
forceParse: 0,
showMeridian: 1,
format: 'yyyy-mm-dd hh:ii:ss'
});
$("input[name='DAILYSTARTTIME']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
weekStart: 1,
todayBtn: 1,
autoclose: 1,
todayHighlight: 1,
startView: 2,
forceParse: 0,
showMeridian: 1,
format: 'yyyy-mm-dd hh:ii:ss'
});
$("input[name='DAILYENDTIME']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
weekStart: 1,
todayBtn: 1,
autoclose: 1,
todayHighlight: 1,
startView: 2,
forceParse: 0,
showMeridian: 1,
format: 'yyyy-mm-dd hh:ii:ss'
});
</script>
</body>

9
sino-activity/src/main/resources/templates/activity/info/configAdd.html
View File

@ -52,7 +52,7 @@
<div class="form-group">
<label class="col-sm-4 control-label is-required">奖品总量：</label>
<div class="col-sm-8">
<input name="TOTALNUMBER" placeholder="奖品总量" class="form-control" type="text" maxlength="30">
<input name="TOTALNUMBER" id="totalnumber" placeholder="奖品总量" onkeyup="total()" class="form-control" type="text" maxlength="30">
</div>
</div>
</div>
@ -60,7 +60,7 @@
<div class="form-group">
<label class="col-sm-4 control-label is-required">剩余数量：</label>
<div class="col-sm-8">
<input name="AVAILABLENUMBER" placeholder="剩余数量" class="form-control" type="text" maxlength="30">
<input name="AVAILABLENUMBER" id="availablenumber" placeholder="剩余数量" class="form-control" type="text" maxlength="30" readonly>
</div>
</div>
</div>
@ -127,7 +127,10 @@
$("#form-info-add").validate({
focusCleanup: true
});
function total(){
var totalnumber = $("#totalnumber").val();
$("#availablenumber").val(totalnumber)
}
/**获取奖品及信息列表*/
$(document).ready(function() {
var job= "";

15
sino-activity/src/main/resources/templates/activity/info/configEdit.html
View File

@ -8,6 +8,7 @@
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-info-edit" th:object="${drawConfig}">
<input type="hidden" name="DRAWCONFIGID" th:value="${DRAWCONFIGID}" />
<input name="count" type="hidden" id="count" th:value="${count}" />
<div class="row">
<div class="col-sm-6">
<div class="form-group">
@ -52,7 +53,7 @@
<div class="form-group">
<label class="col-sm-4 control-label is-required">奖品总量：</label>
<div class="col-sm-8">
<input name="TOTALNUMBER"th:field="*{TOTALNUMBER}" placeholder="奖品总量" class="form-control" type="text" maxlength="30">
<input name="TOTALNUMBER"th:field="*{TOTALNUMBER}" onkeyup="total()" id="totalnumber" placeholder="奖品总量" class="form-control" type="text" maxlength="30">
</div>
</div>
</div>
@ -60,7 +61,7 @@
<div class="form-group">
<label class="col-sm-4 control-label is-required">剩余数量：</label>
<div class="col-sm-8">
<input name="AVAILABLENUMBER" th:field="*{AVAILABLENUMBER}" placeholder="剩余数量" class="form-control" type="text" maxlength="30">
<input name="AVAILABLENUMBER" id="availablenumber" placeholder="剩余数量" class="form-control" type="text" maxlength="30" readonly>
</div>
</div>
</div>
@ -68,7 +69,7 @@
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">奖品发放制度：</label>
<label class="col-sm-4 control-label is-required">奖品发放限制：</label>
<div class="col-sm-8">
<select name="AWARDTYPE" class="form-control" th:with="type=${@dict.getType('AWARDTYPE')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{AWARDTYPE}"></option>
@ -127,11 +128,15 @@
$("#form-info-edit").validate({
focusCleanup: true
});
function total(){
var totalnumber = $("#totalnumber").val() - $("#count").val();
$("#availablenumber").val(totalnumber)
}
/**获取奖品及信息列表*/
$(document).ready(function() {
var PRIZECODE = [[${drawConfig.PRIZECODE}]];
var totalnumber = $("#totalnumber").val() - $("#count").val();
$("#availablenumber").val(totalnumber)
var job= "";
$.ajax({

27
sino-activity/src/main/resources/templates/activity/info/configList.html
View File

@ -12,7 +12,7 @@
<ul>
<li >
<label>活动编码：</label>
<input type="text" name="DRAWCODE" th:value="${DRAWCODE}" readonly/>
<input type="text" name="DRAWCODE" id="DRAWCODE" th:value="${DRAWCODE}" readonly/>
</li>
<li >
<label>活动名称：</label>
@ -27,15 +27,12 @@
<a class="btn btn-success" onclick="$.operate.add(DRAWCODE)" shiro:hasPermission="config:info:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="config:info:edit">
<a class="btn btn-primary single disabled" onclick="edit()" shiro:hasPermission="config:info:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="config:info:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="config:info:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
@ -56,10 +53,9 @@
var options = {
url: prefix + "/" + DRAWCODE + "/list",
createUrl: prefix + "/add/{id}",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "存储奖项配置信息",
modalName: "奖项信息",
columns: [{
checkbox: true
},
@ -141,6 +137,23 @@
};
$.table.init(options);
});
function edit() {
var id = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
var rows = $('#bootstrap-table').bootstrapTable('getSelections')
var prizecode = "";
for (var i = 0; i < rows.length; i++) {
if (i == 0 || i == "0") {
prizecode += rows[i].prizecode;
} else {
prizecode += "," + rows[i].prizecode;
}
}
var drawcode = $("#DRAWCODE").val();
var url = prefix +'/edit/' + id +"/" + prizecode +"/" + drawcode;
$.modal.open("修改" + table.options.modalName, url);
}
</script>
</body>
</html>

52
sino-activity/src/main/resources/templates/activity/info/edit.html
View File

@ -56,7 +56,7 @@
<label class="col-sm-4 control-label is-required">开始时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="STARTTIME" th:value="${#dates.format(drawInfo.STARTTIME, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<input name="STARTTIME" th:value="${#dates.format(drawInfo.STARTTIME, 'yyyy-MM-dd HH:mm:ss HH:mm:ss')}" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
@ -67,7 +67,7 @@
<label class="col-sm-4 control-label is-required">结束时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="ENDTIME" th:value="${#dates.format(drawInfo.ENDTIME, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<input name="ENDTIME" th:value="${#dates.format(drawInfo.ENDTIME, 'yyyy-MM-dd HH:mm:ss HH:mm:ss')}" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
@ -123,7 +123,7 @@
<label class="col-sm-4 control-label is-required">抽奖限制开始时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="DAILYSTARTTIME" th:value="${#dates.format(drawInfo.DAILYSTARTTIME, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<input name="DAILYSTARTTIME" th:value="${#dates.format(drawInfo.DAILYSTARTTIME, 'yyyy-MM-dd HH:mm:ss HH:mm:ss')}" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
@ -134,7 +134,7 @@
<label class="col-sm-4 control-label is-required">抽奖限制结束时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="DAILYENDTIME" th:value="${#dates.format(drawInfo.DAILYENDTIME, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<input name="DAILYENDTIME" th:value="${#dates.format(drawInfo.DAILYENDTIME, 'yyyy-MM-dd HH:mm:ss HH:mm:ss')}" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
@ -247,27 +247,47 @@
});
$("input[name='STARTTIME']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
weekStart: 1,
todayBtn: 1,
autoclose: 1,
todayHighlight: 1,
startView: 2,
forceParse: 0,
showMeridian: 1,
format: 'yyyy-mm-dd hh:ii:ss'
});
$("input[name='ENDTIME']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
weekStart: 1,
todayBtn: 1,
autoclose: 1,
todayHighlight: 1,
startView: 2,
forceParse: 0,
showMeridian: 1,
format: 'yyyy-mm-dd hh:ii:ss'
});
$("input[name='DAILYSTARTTIME']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
weekStart: 1,
todayBtn: 1,
autoclose: 1,
todayHighlight: 1,
startView: 2,
forceParse: 0,
showMeridian: 1,
format: 'yyyy-mm-dd hh:ii:ss'
});
$("input[name='DAILYENDTIME']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
weekStart: 1,
todayBtn: 1,
autoclose: 1,
todayHighlight: 1,
startView: 2,
forceParse: 0,
showMeridian: 1,
format: 'yyyy-mm-dd hh:ii:ss'
});
</script>
</body>

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

@ -107,11 +107,11 @@
},
{
field: 'STARTTIME',
field: 'starttime',
title: '开始时间'
},
{
field: 'ENDTIME',
field: 'endtime',
title: '结束时间'
},