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

新增抽将记录查询播报展示

This commit is contained in:
xu0625 2021-04-21 14:31:05 +08:00
parent bffdf6cd6c
commit 4154f86d5c
11 changed files with 239 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
sino-act-web/src/main/java/com/ruoyi/web/controller/draw/DrawController.java
View File

@ -1,8 +1,7 @@
package com.ruoyi.web.controller.draw; package com.ruoyi.web.controller.draw;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.dto.DrawActivityRequest; import com.ruoyi.dto.*;
import com.ruoyi.web.vo.Const;
import com.ruoyi.web.vo.Result; import com.ruoyi.web.vo.Result;
import com.ruoyi.web.vo.draw.*; import com.ruoyi.web.vo.draw.*;
import com.sinosoft.activity.domain.DrawConfig; import com.sinosoft.activity.domain.DrawConfig;
@ -12,6 +11,7 @@ import com.sinosoft.activity.service.IDrawConfigService;
import com.sinosoft.activity.service.IDrawInfoService; import com.sinosoft.activity.service.IDrawInfoService;
import com.sinosoft.activity.service.IDrawTaskNotifyService; import com.sinosoft.activity.service.IDrawTaskNotifyService;
import com.sinosoft.activity.service.*; import com.sinosoft.activity.service.*;
import com.sinosoft.activity.service.impl.ActPageConfigUserinfoServiceImpl;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
@ -19,7 +19,6 @@ import io.swagger.annotations.ApiOperation;
import me.chanjar.weixin.common.bean.WxOAuth2UserInfo; import me.chanjar.weixin.common.bean.WxOAuth2UserInfo;
import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken; import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken;
import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.api.WxMpService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -32,6 +31,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
@ -58,11 +58,18 @@ public class DrawController {
@Autowired @Autowired
private IActConfigService actConfigService; private IActConfigService actConfigService;
@Autowired @Autowired
private ActPageConfigUserinfoServiceImpl actPageConfigUserinfoServiceImpl;
@Autowired
private IActPageConfigSubscribeService iActPageConfigSubscribeService; private IActPageConfigSubscribeService iActPageConfigSubscribeService;
@Autowired @Autowired
private IActPageConfigUserinfoService iActPageConfigUserinfoService; private IActPageConfigUserinfoService iActPageConfigUserinfoService;
@Autowired @Autowired
private IDrawRecordService iDrawRecordService;
@Autowired
private IDrawUserInfoService iDrawUserInfoService;
@Autowired
private IDrawTaskNotifyService taskNotifyService; private IDrawTaskNotifyService taskNotifyService;
@Autowired @Autowired
private IDrawRuleService drawRuleService; private IDrawRuleService drawRuleService;
@ -174,12 +181,12 @@ public class DrawController {
@RequestMapping(value="/info.action", method = RequestMethod.POST) @RequestMapping(value="/info.action", method = RequestMethod.POST)
@ResponseBody @ResponseBody
public ActPageConfigUserinfoResult info(HttpServletRequest request, String drawCode) { public ActPageConfigUserinfoResult info(HttpServletRequest request, String actCode) {
ActPageConfigUserinfoResult result = new ActPageConfigUserinfoResult(); ActPageConfigUserinfoResult result = new ActPageConfigUserinfoResult();
logger.info("活动编码"+drawCode); logger.info("活动编码"+actCode);
try{ try{
List<ActPageConfigUserinfo> prizes = new ArrayList<ActPageConfigUserinfo>(); List<ActPageConfigUserinfo> prizes = new ArrayList<ActPageConfigUserinfo>();
ActPageConfigUserinfo actPageConfigUserinfo = iActPageConfigUserinfoService.selectActPageConfigUserinfoByCode(drawCode); ActPageConfigUserinfo actPageConfigUserinfo = iActPageConfigUserinfoService.selectActPageConfigUserinfoByCode(actCode);
prizes.add(actPageConfigUserinfo); prizes.add(actPageConfigUserinfo);
result.setActPageConfigUserinfo(prizes); result.setActPageConfigUserinfo(prizes);
}catch (Exception e){ }catch (Exception e){
@ -193,51 +200,28 @@ public class DrawController {
@ResponseBody @ResponseBody
public PrizeResult prizes(HttpServletRequest request, String drawCode, String isAll) { public PrizeResult prizes(HttpServletRequest request, String drawCode, String isAll) {
PrizeResult result = new PrizeResult(); PrizeResult result = new PrizeResult();
List<Prize> prizes = new ArrayList<Prize>(); List<DrawRecord> prizes = new ArrayList<DrawRecord>();
try { try {
HttpSession session = request.getSession(); HttpSession session = request.getSession();
WxOAuth2UserInfo userInfo = getUserInfo(request, null); WxOAuth2UserInfo userInfo = getUserInfo(request, null);
if (userInfo == null && !"1".equals(isAll)) { /* if (userInfo == null && !"1".equals(isAll)) {
result.setPrizes(prizes); result.setRecord(prizes);
return result; return result;
} }*/
String userId = null; String userId ="1328495419744";
if (!"1".equals(isAll)) { /* if (!"1".equals(isAll)) {
Long userId1 = ShiroUtils.getUserId();
userId = userInfo.getOpenid(); userId = userInfo.getOpenid();
}*/
List<DrawRecord> drawRecords = iDrawRecordService.selectDrawRecordCodeList(drawCode, userId);
for (DrawRecord draw: drawRecords) {
String mobile = draw.getPHONE();
if (StringUtils.isNotBlank(mobile)) {
draw.setPHONE(mobile.substring(0, 3) + "****" + mobile.substring(7, mobile.length()));
}
} }
// AwardPrizeListResponse awardPrizeListResponse = activityService.awardPrizeList(drawCode, userId).get_return(); result.setRecord(drawRecords);
// AwardPrizeListResponseHeader header = awardPrizeListResponse.getHeader();
// result.setRespCode(header.getResultCode());
// result.setRespMsg(header.getResultInfo());
// AwardPrizeListResponseBody responseBody = awardPrizeListResponse.getResponseBody();
// AwardPrizeList[] awardPrizes = responseBody.getAwardPrizeLists();
// if (awardPrizes != null) {
// for (int i = 0; i < awardPrizes.length; i++) {
// AwardPrizeList awardPrize = awardPrizes[i];
// Prize prize = new Prize();
// prize.setPrizeCode(awardPrize.getPrizeCode());
// prize.setPrizeName(awardPrize.getPrizeName());
// prize.setPrizeType(awardPrize.getPrizeType());
// prize.setDrawTime(DateUtil.convertDate(DateUtil.convertStringToDate(awardPrize.getDrawTime(), DateUtil.YYYYMMDDHHMMSSS), "yyyy/MM/dd HH:mm"));
// prize.setStatus(awardPrize.getStatus());
// prize.setExtId(awardPrize.getExtId());
// prize.setGatewayFlow(awardPrize.getGatewayFolw());
// String userName = awardPrize.getUserName();
// if (StringUtils.isNotBlank(userName)) {
// int end = 1;
// if (userName.length()==2) {
// end = 0;
// }
// prize.setUserName(StringUtil.getStarString2(userName, 1, end));
// }
// String mobile = awardPrize.getMobile();
// if (StringUtils.isNotBlank(mobile)) {
// prize.setMobile(StringUtil.getStarString2(mobile, 3, 4));
// }
// prizes.add(prize);
// }
// }
result.setPrizes(prizes);
} catch (Exception e) { } catch (Exception e) {
result.setRespCode("-1"); result.setRespCode("-1");
result.setRespMsg("系统异常，请稍后再试"); result.setRespMsg("系统异常，请稍后再试");
@ -309,42 +293,13 @@ public class DrawController {
} }
return result; return result;
} }
@RequestMapping(value="/saveAddress.action", method = RequestMethod.POST) @RequestMapping(value="/saveAddress", method = RequestMethod.POST)
@ResponseBody @ResponseBody
public Result saveAddress(HttpServletRequest request, String drawCode, String uname, String phone, String addr, String flow) { public Result saveAddress(HttpServletRequest request, DrawUserInfo userInfo) {
Result result = new Result(); Result result = new Result();
try { try {
HttpSession session = request.getSession(); userInfo.setCreateTime(new Date());
WxOAuth2UserInfo userInfo = getUserInfo(request, null); iDrawUserInfoService.insertDrawUserInfo(userInfo);
if (userInfo == null) {
result.setRespCode("-2");
result.setRespMsg("会话已失效，请重新登录");
logger.info("DrawController.saveAddress userId is null");
return result;
}
if (StringUtils.isBlank(uname)) {
result.setRespCode("-4");
result.setRespMsg("请输入姓名");
return result;
}
// String validateMobile = CommonValidate.validateMobile(phone, "1");
// if (StringUtils.isNotBlank(validateMobile)) {
// result.setRespCode("-4");
// result.setRespMsg(validateMobile);
// return result;
// }
String userId = userInfo.getOpenid();
// SaveUserAddressRequestBody requestBody = new SaveUserAddressRequestBody();
// requestBody.setDrawCode(drawCode);
// requestBody.setGatewayFlow(flow);
// requestBody.setUserId(userId);
// requestBody.setUserName(uname);
// requestBody.setPhone(phone);
// requestBody.setAddress(addr);
// //实物留资
// requestBody.setNotifyType("007");
// requestBody.setCity("无");
// activityService.saveUserAddress(requestBody);
} catch (Exception e) { } catch (Exception e) {
result.setRespCode("-1"); result.setRespCode("-1");
result.setRespMsg("系统异常，请稍后再试"); result.setRespMsg("系统异常，请稍后再试");
@ -410,7 +365,7 @@ public class DrawController {
}catch (Exception e){ }catch (Exception e){
result.setRespCode("-1"); result.setRespCode("-1");
result.setRespMsg("系统异常，请稍后再试"); result.setRespMsg("系统异常，请稍后再试");
logger.error("DrawController.saveAddress ex: ", e); logger.error("DrawController.qrCode ex: ", e);
} }
return result; return result;
} }
@ -431,5 +386,4 @@ public class DrawController {
return result; return result;
} }
} }

11
sino-act-web/src/main/java/com/ruoyi/web/vo/draw/PrizeResult.java
View File

@ -1,12 +1,15 @@
package com.ruoyi.web.vo.draw; package com.ruoyi.web.vo.draw;
import com.ruoyi.web.vo.Result; import com.ruoyi.web.vo.Result;
import com.sinosoft.activity.domain.DrawRecord;
import java.util.List; import java.util.List;
public class PrizeResult extends Result { public class PrizeResult extends Result {
private List<Prize> prizes; private List<Prize> prizes;
private List<DrawRecord> record;
public List<Prize> getPrizes() { public List<Prize> getPrizes() {
return prizes; return prizes;
} }
@ -14,4 +17,12 @@ public class PrizeResult extends Result {
public void setPrizes(List<Prize> prizes) { public void setPrizes(List<Prize> prizes) {
this.prizes = prizes; this.prizes = prizes;
} }
public List<DrawRecord> getRecord() {
return record;
}
public void setRecord(List<DrawRecord> record) {
this.record = record;
}
} }

15
sino-act-web/src/main/resources/public/draw/css/goods.css
View File

@ -71,4 +71,19 @@
margin-top:10px; margin-top:10px;
outline: none; outline: none;
line-height:20px; line-height:20px;
}
.button { /* 按钮美化 */
width: 40px; /* 宽度 */
height: 30px; /* 高度 */
border-width: 0px; /* 边框宽度 */
border-radius: 3px; /* 边框半径 */
background: #d1d1d1; /* 背景颜色 */
cursor: pointer; /* 鼠标移入按钮范围时出现手势 */
outline: none; /* 不显示轮廓线 */
font-family: Microsoft YaHei; /* 设置字体 */
color: white; /* 字体颜色 */
font-size: 17px; /* 字体大小 */
}
.button:hover { /* 鼠标移入按钮范围时改变颜色 */
background: #5599FF;
} }

56
sino-act-web/src/main/resources/public/draw/js/draw.js
View File

@ -58,23 +58,23 @@ function myprizes() {
data: {drawCode: drawCode}, data: {drawCode: drawCode},
dataType: "json", dataType: "json",
success: function(data){ success: function(data){
if (!data.prizes) { if (!data.record) {
return; return;
} }
console.log(data.prizes); console.log(data.record);
$.each(data.prizes, function (i, n) { $.each(data.record, function (i, n) {
var ptype = n.prizeType; var ptype = n.prizetype;
var status = n.status; var status = n.status;
var iscenter = 0; var iscenter = 0;
var prize = $('.prize_li').clone(); var record = $('.prize_li').clone();
$(prize).css('display', 'inherit'); $(record).css('display', 'inherit');
prize.removeClass('prize_li'); record.removeClass('prize_li');
prize.find('.pname').html(n.prizeName); record.find('.pname').html(n.prizename);
prize.find('.time').html(n.drawTime); record.find('.time').html(n.createtimestamp);
$(prize).attr('val', n.prizeCode); $(record).attr('val', n.prizecode);
$(prize).attr('flow', n.gatewayFlow); $(record).attr('flow', n.drawtranseqno);
$(prize).attr('ptype', ptype); $(record).attr('ptype', n.prizetype);
$('.popList').append(prize); $('.popList').append(record);
}); });
}, },
error: function (XMLHttpRequest, textStatus, errorThrown) { error: function (XMLHttpRequest, textStatus, errorThrown) {
@ -132,10 +132,10 @@ function prizes() {
dataType: "json", dataType: "json",
success: function(data){ success: function(data){
var content = ''; var content = '';
if (data.prizes) { if (data.record) {
$.each(data.prizes, function (i, n) { $.each(data.record, function (i, n) {
if (n.mobile) { if (n.phone) {
content = content + ('<li>恭喜 '+n.mobile+' 获得'+n.prizeName+'</li>'); content = content + ('<li>恭喜 '+n.phone+' 获得'+n.prizename+'</li>');
} }
}); });
} }
@ -152,6 +152,12 @@ function prizes() {
} }
function saveAddr() { function saveAddr() {
var boolean = $("#protocol").prop("checked");
if (!boolean){
tip('请勾选协议');
return ;
}
var uname = $('.uname').val(); var uname = $('.uname').val();
var phone = $('.phone').val(); var phone = $('.phone').val();
var addr = $('.addr').val(); var addr = $('.addr').val();
@ -172,22 +178,26 @@ function saveAddr() {
} else { } else {
} }
var flow = $('.flow').val(); var flow = $('.flow').val();
uname = getEntryptPwd(uname); /* uname = getEntryptPwd(uname);
phone = getEntryptPwd(phone); phone = getEntryptPwd(phone);*/
var data = $("#addressId").serialize();
$.ajax({ $.ajax({
type: "POST", url: contextRootPath+"/draw/saveAddress",
url: contextRootPath+"/draw/saveAddress.action",
data: {drawCode: drawCode, flow:flow, uname: uname, phone: phone, addr: addr},
dataType: "json", dataType: "json",
type: "post",
data: data,
success: function(data){ success: function(data){
if (data.respCode == '1') { if (data.respCode == '1') {
if ('integral' == prizeType) { if ('integral' == prizeType) {
} else if ('materialObject' == prizeType) { } else if ('materialObject' == prizeType) {
} else { } else {
} }
$('.goods').hide();
$('.register').show(); $('.register').show();
} else { } else {
$('.register').show();
tip(data.respMsg); tip(data.respMsg);
} }
}, },

143
sino-act-web/src/main/resources/public/draw/scratchcard.html
View File

@ -4,15 +4,18 @@
<head> <head>
<meta name="viewport" <meta name="viewport"
content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" /> content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
<meta charset="GBK"> <meta charset="UTF-8">
<meta name="format-detection" content="telephone=no" /> <meta name="format-detection" content="telephone=no" />
<title>支付抽好礼，好运伴随你</title> <title>支付抽好礼，好运伴随你</title>
<link rel="stylesheet" href="css/reset.css"> <link rel="stylesheet" href="css/reset.css">
<link rel="stylesheet" href="css/style.css"> <link rel="stylesheet" href="css/style.css">
<link rel="stylesheet" href="css/main.css"> <link rel="stylesheet" href="css/main.css">
<link rel="stylesheet" type="text/css" href="css/popup.css"/> <link rel="stylesheet" type="text/css" href="css/popup.css"/>
<link rel="stylesheet" type="text/css" href="css/myPrize.css"/> <link rel="stylesheet" type="text/css" href="css/myPrize.css"/>
<link rel="stylesheet" type="text/css" href="css/rule.css"/> <link rel="stylesheet" type="text/css" href="css/rule.css"/>
<script src="js/jquery-1.9.1.min.js"></script>
<script src="/js/config.js"></script>
<style type="text/css"> <style type="text/css">
.popupBox{ .popupBox{
width:100%; width:100%;
@ -25,61 +28,63 @@
<body class="template_bg popupBox" style="background-color: #f9eec8;"> <body class="template_bg popupBox" style="background-color: #f9eec8;">
<div class="promotion_goBack rtn_btn" onclick="rtn()"> <div class="promotion_goBack rtn_btn" onclick="rtn()">
<span class="btn_back"><img src="images/btn_back.png" alt=""></span> <span class="btn_back"><img src="images/btn_back.png" alt=""></span>
<span>返回</span> <span>返回</span>
</div> </div>
<div class="promotion_container"> <div class="promotion_container">
<header class="template_header"> <header class="template_header">
<p class="header_left"><span onclick="drawrule()">活动规则</span></p> <p class="header_left"><span onclick="drawrule()">活动规则</span></p>
<p class="header_right"><span onclick="myprizes()">我的奖品</span></p> <p class="header_right"><span onclick="myprizes()">我的奖品</span></p>
<!-- <p class="header_right" style="position: absolute;top: 2rem;right: 0;z-index: 10;"><span onclick="rtn()">&nbsp;返&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;回&nbsp;</span></p>--> <!-- <p class="header_right" style="position: absolute;top: 2rem;right: 0;z-index: 10;"><span onclick="rtn()">&nbsp;返&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;回&nbsp;</span></p>-->
</header> </header>
<!-- 推广图1 --> <!-- 推广图1 -->
<div class="promotion_main clearfix promotion_main_1 nowPage"> <div class="promotion_main clearfix promotion_main_1 nowPage">
<!-- 红包 --> <!-- 红包 -->
<div class="zk_red_box"> <div class="zk_red_box">
<div class="zk_red_box_header"> <div class="zk_red_box_header">
<h2 class="title">剩余抽奖次数：<span class="num">0</span>次</h2> <h2 class="title">剩余抽奖次数：<span class="num">0</span>次</h2>
<!-- 刮奖区 --> <!-- 刮奖区 -->
<!-- <div class="scratch_off_popup"> --> <!-- <div class="scratch_off_popup"> -->
<canvas id="canvas" style="height: 4rem;"></canvas> <canvas id="canvas" style="height: 4rem;"></canvas>
<!-- </div> --> <!-- </div> -->
<!-- 三种状态 --> <!-- 三种状态 -->
<div style="display: none;" class="scratch_off_box success"> <div style="display: none;" class="scratch_off_box success">
<p class="cue" style="display: none;">恭喜你获得现金红包</p> <p class="cue" style="display: none;">恭喜你获得现金红包</p>
<p class="amount" style="margin-top: 0.18rem;">0.08元</p> <p class="amount" style="margin-top: 0.18rem;">0.08元</p>
<p class="remark" style="padding-top: 0.3rem;color: #bbadad;">红包将在2小时内发放至您的一账通绑定银行卡中，请注意查收</p> <p class="remark" style="padding-top: 0.3rem;color: #bbadad;">红包将在2小时内发放至您的一账通绑定银行卡中，请注意查收</p>
<p class="again_btn">再来一次</p> <p class="again_btn">再来一次</p>
</div> </div>
<div style="display: none;" class="scratch_off_box fail"> <div style="display: none;" class="scratch_off_box fail">
<p>大奖离你还差一点儿，加油</p> <p>大奖离你还差一点儿，加油</p>
<p class="again_btn">再抽一次</p> <p class="again_btn">再抽一次</p>
</div> </div>
<div style="display: none;" class="scratch_off_box no_chance"> <div style="display: none;" class="scratch_off_box no_chance">
<p><img src="images/16.gif" style="width: 25px;vertical-align: middle;" alt="">您的抽奖机会已用完</p> <p><img src="images/16.gif" style="width: 25px;vertical-align: middle;" alt="">您的抽奖机会已用完</p>
<p>推荐客户获取更多抽奖机会吧～</p> <p>推荐客户获取更多抽奖机会吧～</p>
</div> </div>
</div> </div>
<div class="zk_red_box_footer"> <div class="zk_red_box_footer">
<p>今日有机会刮出</p> <p>今日有机会刮出</p>
</div> </div>
</div> </div>
<!-- 获奖人 --> <!-- 获奖人 -->
<div class="myscroll zk_carry_box"> <div class="lucy_info">
<ul class=""> <img src="images/icon_hb1.png" />
<!-- zk_carry_box --> <div class="myscroll">
<li>恭喜 187****1234 获得现金红包</li> <ul>
</ul> <li>恭喜 187****1234 获得爱奇艺月卡</li>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="tip_copy" style="display: none;"> <div class="tip_copy" style="display: none;">
<p></p> <p></p>
</div> </div>
<!--我的奖品 弹窗--> <!--我的奖品 弹窗-->
<div class='popup myPrize' style="display: none;"> <div class='popup myPrize' style="display: none;">
<div class='popupMin'> <div class='popupMin'>
<img src="images/top02.png" class='top'> <img src="images/top02.png" class='top'>
@ -88,13 +93,13 @@
<div class='cont'> <div class='cont'>
<div> <div>
<img src="images/left.png"> <img src="images/left.png">
<div>我的奖品</div> <div>我的奖品</div>
<img src="images/right.png"> <img src="images/right.png">
</div> </div>
<div class='postListTop'> <div class='postListTop'>
<div> <div>
<div>抽中奖品</div> <div>抽中奖品</div>
<div>获奖时间</div> <div>获奖时间</div>
</div> </div>
</div> </div>
<div class='popList'> <div class='popList'>
@ -108,10 +113,10 @@
<img src="images/delect.png" class='popDelect prizeDelect'> <img src="images/delect.png" class='popDelect prizeDelect'>
</div> </div>
<div class="prize_li" style="display: none;"> <div class="prize_li" style="display: none;">
<div class="pname">奖品名称</div> <div class="pname">奖品名称</div>
<div class="time">2020/08/05 09:00</div> <div class="time">2020/08/05 09:00</div>
</div> </div>
<!--活动规则--> <!--活动规则-->
<div class='popup rule' style="display: none;"> <div class='popup rule' style="display: none;">
<div class='popupMin'> <div class='popupMin'>
<img src="images/top02.png" class='top'> <img src="images/top02.png" class='top'>
@ -120,22 +125,22 @@
<div class='cont'> <div class='cont'>
<div> <div>
<img src="images/left.png"> <img src="images/left.png">
<div>活动规则</div> <div>活动规则</div>
<img src="images/right.png"> <img src="images/right.png">
</div> </div>
<ul class='contBox' style="list-style: inside"> <ul class='contBox' style="list-style: inside">
<!-- <li class='content'>活动时间：2020年10月29日-12月31日。</li>--> <!-- <li class='content'><EFBFBD>ʱ<EFBFBD>䣺2020<EFBFBD><EFBFBD>10<EFBFBD><EFBFBD>29<EFBFBD><EFBFBD>-12<EFBFBD><EFBFBD>31<EFBFBD>ա<EFBFBD></li>-->
<!-- <li class='content'>活动期间，客户推荐客户使用一账通完成支付（不包含理财产品购买、手机充值、生活缴费），即可获得一次红包抽奖机会，中奖概率100%。抽奖机会有效期截止至2021年1月15日。</li>--> <!-- <li class='content'><EFBFBD><EFBFBD>ڼ䣬<EFBFBD>ͻ<EFBFBD><EFBFBD>Ƽ<EFBFBD><EFBFBD>ͻ<EFBFBD>ʹ<EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD>ͨ<EFBFBD><EFBFBD><EFBFBD>֧<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ʋ<EFBFBD>Ʒ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֻ<EFBFBD><EFBFBD><EFBFBD>ֵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɷѣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɻ<EFBFBD><EFBFBD>һ<EFBFBD>κ<EFBFBD><EFBFBD><EFBFBD>齱<EFBFBD><EFBFBD><EFBFBD>ᣬ<EFBFBD>н<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>100%<25><><EFBFBD>齱<EFBFBD><E9BDB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ч<EFBFBD>ڽ<EFBFBD>ֹ<EFBFBD><D6B9>2021<32><31>1<EFBFBD><31>15<31>ա<EFBFBD></li>-->
<!-- <li class='content'>奖品现金红包29400个，中奖概率100%，中奖后，系统将自动发放到您的手机或银行卡中，请及时查收。</li>--> <!-- <li class='content'><EFBFBD><EFBFBD>Ʒ<EFBFBD>ֽ<EFBFBD><EFBFBD><EFBFBD>29400<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>н<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>100%<25><><EFBFBD>н<EFBFBD><D0BD><EFBFBD>ϵͳ<CFB5><CDB3><EFBFBD>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD>ŵ<EFBFBD><C5B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֻ<EFBFBD><D6BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>п<EFBFBD><D0BF>У<EFBFBD><D0A3>뼰ʱ<EBBCB0><CAB1><EFBFBD>ա<EFBFBD></li>-->
<!-- <li class='content'>最终奖品情况以活动实际情况为准，中国人寿保留调整相关奖品情况的权利，如奖品发生变更，将通过抽奖活动页面进行公示。</li>--> <!-- <li class='content'><EFBFBD><EFBFBD><EFBFBD>ս<EFBFBD>Ʒ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Իʵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ׼<EFBFBD><EFBFBD><EFBFBD>й<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ٱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ؽ<EFBFBD>Ʒ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>罱Ʒ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͨ<EFBFBD><EFBFBD><EFBFBD>齱<EFBFBD>ҳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>й<EFBFBD>ʾ<EFBFBD><EFBFBD></li>-->
<!-- <li class='content'>中奖后，用户需及时领取奖励，并提交所需领取信息，若因领奖信息有误、不完整而导致奖品未能及时获得、无法正常发放，或活动结束用户仍未领取奖品，则视为用户放弃该奖品。</li>--> <!-- <li class='content'><EFBFBD>н<EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><EFBFBD>輰ʱ<EFBFBD><EFBFBD>ȡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ύ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȡ<EFBFBD><EFBFBD>Ϣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>콱<EFBFBD><EFBFBD>Ϣ<EFBFBD><EFBFBD><EFBFBD>󡢲<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>½<EFBFBD>Ʒδ<EFBFBD>ܼ<EFBFBD>ʱ<EFBFBD><EFBFBD>á<EFBFBD><EFBFBD>޷<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ţ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><EFBFBD><EFBFBD>δ<EFBFBD><EFBFBD>ȡ<EFBFBD><EFBFBD>Ʒ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD>û<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ý<EFBFBD>Ʒ<EFBFBD><EFBFBD></li>-->
<!-- <li class='content'>用户参加活动即视为理解并同意本活动规则。</li>--> <!-- <li class='content'><EFBFBD>û<EFBFBD><EFBFBD>μӻ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><EFBFBD>Ⲣͬ<EFBFBD>Ȿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></li>-->
<!-- <li class='content'>对活动有任何疑问，请点击活动首页左侧的客服图标进行咨询，也可联系中国人寿在线客服（关注“中国人寿保险”微信公众号，在对话框输入“0”，再输入“2”即可）。</li>--> <!-- <li class='content'><EFBFBD>Ի<EFBFBD><EFBFBD><EFBFBD>κ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҳ<EFBFBD><EFBFBD><EFBFBD>Ŀͷ<EFBFBD>ͼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѯ<EFBFBD><EFBFBD>Ҳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϵ<EFBFBD>й<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߿ͷ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ע<EFBFBD><EFBFBD><EFBFBD>й<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ٱ<EFBFBD><EFBFBD>ա<EFBFBD>΢<EFBFBD>Ź<EFBFBD><EFBFBD>ںţ<EFBFBD><EFBFBD>ڶԻ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>롰0<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>롰2<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɣ<EFBFBD><EFBFBD><EFBFBD></li>-->
<!-- <li class='content'>理财产品包括养老保障、现金宝、鑫享宝及其他基金产品。</li>--> <!-- <li class='content'><EFBFBD><EFBFBD>Ʋ<EFBFBD>Ʒ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD><EFBFBD>ϡ<EFBFBD><EFBFBD>ֽ𱦡<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ʒ<EFBFBD><EFBFBD></li>-->
<!-- <li class='content'>在参与活动的过程中，如出现违规操作行为或违反活动规则进行恶意套利的用户，中国人寿有权追回奖励、取消其参与本次活动的资格并追究其法律责任。</li>--> <!-- <li class='content'><EFBFBD>ڲ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĺ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>У<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Υ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><EFBFBD>Υ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ж<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><EFBFBD><EFBFBD><EFBFBD>й<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ׷<EFBFBD>ؽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>뱾<EFBFBD>λ<EFBFBD><EFBFBD><EFBFBD>ʸ<EFBFBD>׷<EFBFBD><EFBFBD><EFBFBD>䷨<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ρ<EFBFBD></li>-->
<!-- <li class='content'>本活动最终解释权归中国人寿电子商务有限公司所有，中国人寿电子商务有限公司保留修改上述条款和条件的权利，所有条款和条件将在法律允许的最大程度内使用。</li>--> <!-- <li class='content'><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ս<EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD>й<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ٵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޹<EFBFBD>˾<EFBFBD><EFBFBD><EFBFBD>У<EFBFBD><EFBFBD>й<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ٵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޹<EFBFBD>˾<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޸<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڷ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̶<EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD>á<EFBFBD></li>-->
<!-- <li class='content'>本活动与苹果公司无关。</li>--> <!-- <li class='content'><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƻ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>˾<EFBFBD>޹ء<EFBFBD></li>-->
<!-- <li class='content'>奖品数量有限，先到先得。</li>--> <!-- <li class='content'><EFBFBD><EFBFBD>Ʒ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޣ<EFBFBD><EFBFBD>ȵ<EFBFBD><EFBFBD>ȵá<EFBFBD></li>-->
</ul> </ul>
</div> </div>
@ -146,14 +151,11 @@
<img src="images/delect.png" class='popDelect ruleDelect'> <img src="images/delect.png" class='popDelect ruleDelect'>
<span style='clear: both;'></span> <span style='clear: both;'></span>
</div> </div>
<script src="js/jquery-1.9.1.min.js"></script>
<script src="js/main.js"></script> <script src="js/main.js"></script>
<script src="js/scroll.js"></script> <script src="js/scroll.js"></script>
<script src="../../common/taglibs.js"></script>
<script src="js/util.js"></script> <script src="js/util.js"></script>
<script src="js/draw.js"></script> <script src="js/draw.js"></script>
<script src="js/common.js"></script> <script src="js/common.js"></script>
<script src="../../js/mobile/login_register/login.js"></script>
<script> <script>
(function () { (function () {
var num = 0; var num = 0;
@ -167,11 +169,11 @@
$('.num').text(num); $('.num').text(num);
}, },
error: function (XMLHttpRequest, textStatus, errorThrown) { error: function (XMLHttpRequest, textStatus, errorThrown) {
console.log('网络异常', textStatus, errorThrown); console.log('网络异常', textStatus, errorThrown);
} }
}); });
// 设置推广内容高度 // 设置推广内容高度
function innerHeight() { function innerHeight() {
if(!$('.promotion_main_1').is(':hidden')) { if(!$('.promotion_main_1').is(':hidden')) {
var arr = []; var arr = [];
@ -191,14 +193,14 @@
$('.myscroll').myScroll({ $('.myscroll').myScroll({
speed: 80, //数值越大，速度越慢 speed: 80, //数值越大，速度越慢
rowHeight: 24//li的高度 rowHeight: 24//li的高度
}); });
// 设置初始的中奖状态 success-中奖 fail-未中奖 no_chance-没有抽奖机会 // 设置初始的中奖状态 success-中奖 fail-未中奖 no_chance-没有抽奖机会
var status = ''; var status = '';
// 刮奖效果 -zk // 刮奖效果 -zk
window.onload = function(){ window.onload = function(){
// let list = $('.scratch_off_box'); // let list = $('.scratch_off_box');
// setTimeout(()=>{ // setTimeout(()=>{
@ -216,8 +218,8 @@
var style = window.getComputedStyle(canvas, null); var style = window.getComputedStyle(canvas, null);
var cssWidth = parseFloat(style["width"]); var cssWidth = parseFloat(style["width"]);
var cssHeight = parseFloat(style["height"]); var cssHeight = parseFloat(style["height"]);
var scaleX = canvas.width / cssWidth; // 水平方向的缩放因子 var scaleX = canvas.width / cssWidth; // 水平方向的缩放因子
var scaleY = canvas.height / cssHeight; // 垂直方向的缩放因子 var scaleY = canvas.height / cssHeight; // 垂直方向的缩放因子
var ctx = canvas.getContext('2d'); var ctx = canvas.getContext('2d');
ctx.strokeStyle = 'red'; ctx.strokeStyle = 'red';
@ -238,9 +240,9 @@
var rect = canvas.getBoundingClientRect(); var rect = canvas.getBoundingClientRect();
var time = 0; var time = 0;
var running = false; var running = false;
// 新增-2020-8-20-初始化 中奖状态 // 新增-2020-8-20-初始化 中奖状态
canvas.addEventListener('touchstart',function(){ canvas.addEventListener('touchstart',function(){
// success-中奖 fail-未中奖 no_chance-没有抽奖机会 // success-中奖 fail-未中奖 no_chance-没有抽奖机会
if (running) { if (running) {
console.log('running...'); console.log('running...');
return; return;
@ -259,8 +261,8 @@
x -= rect.left; x -= rect.left;
y -= rect.top; y -= rect.top;
x *= scaleX; // 修正水平方向的坐标 x *= scaleX; // 修正水平方向的坐标
y *= scaleY; // 修正垂直方向的坐标 y *= scaleY; // 修正垂直方向的坐标
// ctx.clearRect(x,y,15,15) // ctx.clearRect(x,y,15,15)
clearArcFun(x,y,15,ctx); clearArcFun(x,y,15,ctx);
isArea(); isArea();
@ -268,9 +270,9 @@
}) })
function isArea(){ function isArea(){
//判断刮开面积是否到达百分之六十 //判断刮开面积是否到达百分之六十
console.log('执行isArea效果') console.log('执行isArea效果')
var data = ctx.getImageData(0,0,canvas.width,canvas.height).data;//获取画布的信息 var data = ctx.getImageData(0,0,canvas.width,canvas.height).data;//获取画布的信息
var n = 0 ; var n = 0 ;
for (var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
if (data[i] == 0) { if (data[i] == 0) {
@ -278,15 +280,15 @@
}; };
}; };
if (n >= data.length * 0.6) { if (n >= data.length * 0.6) {
ctx.globalCompositeOperation = 'destination-over';//重点 ctx.globalCompositeOperation = 'destination-over';//重点
// ctx.canvas.style.opacity = 0; // ctx.canvas.style.opacity = 0;
ctx.clearRect(0,0,canvas.width,canvas.height); ctx.clearRect(0,0,canvas.width,canvas.height);
$('#canvas').css('pointer-events','none') $('#canvas').css('pointer-events','none')
} }
} }
function clearArcFun(x,y,r,cxt){ //(x,y)为要清除的圆的圆心，r为半径，cxt为context function clearArcFun(x,y,r,cxt){ //(x,y)为要清除的圆的圆心，r为半径，cxt为context
var stepClear=1;//别忘记这一步 var stepClear=1;//别忘记这一步
clearArc(x,y,r); clearArc(x,y,r);
function clearArc(x,y,radius){ function clearArc(x,y,radius){
var calcWidth=radius-stepClear; var calcWidth=radius-stepClear;
@ -306,11 +308,11 @@
} }
} }
// 再抽一次 // 再抽一次
$('.again_btn').click(function(){ $('.again_btn').click(function(){
if(num<1) { if(num<1) {
$('.no_chance').show().siblings('.scratch_off_box').hide(); $('.no_chance').show().siblings('.scratch_off_box').hide();
console.log('抽奖次数不足') console.log('抽奖次数不足')
return; return;
} }
drawimage(); drawimage();
@ -336,7 +338,7 @@
} }
if(respCode == 'GT00007') { if(respCode == 'GT00007') {
$('.no_chance').show().siblings('.scratch_off_box').hide(); $('.no_chance').show().siblings('.scratch_off_box').hide();
console.log('抽奖次数不足'); console.log('抽奖次数不足');
return; return;
} }
running = false; running = false;
@ -358,7 +360,7 @@
setPrizeInfo(prizeType, prizeCode, data.cue, data.gatewayFlow); setPrizeInfo(prizeType, prizeCode, data.cue, data.gatewayFlow);
}, },
error: function (XMLHttpRequest, textStatus, errorThrown) { error: function (XMLHttpRequest, textStatus, errorThrown) {
console.log('网络异常', textStatus, errorThrown); console.log('网络异常', textStatus, errorThrown);
running = false; running = false;
} }
}); });
@ -370,6 +372,7 @@
})(); })();
prizes(); prizes();
</script> </script>
</body> </body>
</html> </html>

11
sino-act-web/src/main/resources/public/draw/turntable.html
View File

@ -119,7 +119,9 @@
callback: function () { //回调 callback: function () { //回调
console.log(txt); console.log(txt);
if ('materialObject' == prizeType) { if ('materialObject' == prizeType) {
$('.goods').show(); $('.goods').show();
window.location.href='address.html?drawCode='+drawCode;
} else { } else {
$('.winPrize').show(); $('.winPrize').show();
} }
@ -389,11 +391,8 @@
<div>恭喜您获得</div> <div>恭喜您获得</div>
<div class="cue">戴森吸尘器</div> <div class="cue">戴森吸尘器</div>
<div>请留下收货信息，我们奖品将在活动结束后四十个工作日寄送</div> <div>请留下收货信息，我们奖品将在活动结束后四十个工作日寄送</div>
<input class="uname" type="text" value="" placeholder="请输入收货人姓名"/>
<input class="phone" type="text" value="" placeholder="请输入收货人手机号码" maxlength="11"/>
<textarea class="addr" rows="" cols="" placeholder="请输入收货地址"></textarea>
<input class="flow" type="hidden" value=""> <input class="flow" type="hidden" value="">
<img src="images/btn1.png" class='popBtn popBtn3' onclick="saveAddr()"> <div type="button" class='button' onclick="qrCode()">确认</div>
</div> </div>
<div class='right'></div> <div class='right'></div>
</div> </div>
@ -444,6 +443,10 @@
<script src="js/common.js"></script> <script src="js/common.js"></script>
<script> <script>
prizes(); prizes();
function qrCode(){
window.location.href='../act/address.html?drawCode='+drawCode;
}
</script> </script>
</body> </body>

12
sino-activity/src/main/java/com/sinosoft/activity/domain/DrawRecord.java
View File

@ -91,8 +91,18 @@ public class DrawRecord extends BaseEntity
/** 扩展域 */ /** 扩展域 */
@Excel(name = "扩展域") @Excel(name = "扩展域")
private String EXTAREA; private String EXTAREA;
/** 奖品名称*/
private String PRIZENAME;
public void setDRAWRECORDID(String DRAWRECORDID) public String getPRIZENAME() {
return PRIZENAME;
}
public void setPRIZENAME(String PRIZENAME) {
this.PRIZENAME = PRIZENAME;
}
public void setDRAWRECORDID(String DRAWRECORDID)
{ {
this.DRAWRECORDID = DRAWRECORDID; this.DRAWRECORDID = DRAWRECORDID;
} }

16
sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawRecordMapper.java
View File

@ -2,6 +2,7 @@ package com.sinosoft.activity.mapper;
import java.util.List; import java.util.List;
import com.sinosoft.activity.domain.DrawRecord; import com.sinosoft.activity.domain.DrawRecord;
import org.apache.ibatis.annotations.Param;
/** /**
* 抽奖记录信息Mapper接口 * 抽奖记录信息Mapper接口
@ -59,4 +60,19 @@ public interface DrawRecordMapper
* @return 结果 * @return 结果
*/ */
public int deleteDrawRecordByIds(String[] DRAWRECORDIDs); public int deleteDrawRecordByIds(String[] DRAWRECORDIDs);
/**
*查询抽奖记录信息
* @param drawCode
* @param userId
* @return
*/
List<DrawRecord> selectDrawRecordCodeUserList(@Param("drawCode") String drawCode,@Param("userId") String userId);
/**
* 查询抽奖记录信息
* @param drawCode
* @return
*/
List<DrawRecord> selectDrawRecordCodeList(String drawCode);
} }

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

@ -59,4 +59,6 @@ public interface IDrawRecordService
* @return 结果 * @return 结果
*/ */
public int deleteDrawRecordById(String DRAWRECORDID); public int deleteDrawRecordById(String DRAWRECORDID);
List<DrawRecord> selectDrawRecordCodeList(String drawCode, String userId);
} }

9
sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawRecordServiceImpl.java
View File

@ -96,4 +96,13 @@ public class DrawRecordServiceImpl implements IDrawRecordService
{ {
return drawRecordMapper.deleteDrawRecordById(DRAWRECORDID); return drawRecordMapper.deleteDrawRecordById(DRAWRECORDID);
} }
@Override
public List<DrawRecord> selectDrawRecordCodeList(String drawCode, String userId) {
if(!(userId==null || "".equals(userId))){
return drawRecordMapper.selectDrawRecordCodeUserList(drawCode ,userId);
}else{
return drawRecordMapper.selectDrawRecordCodeList(drawCode);
}
}
} }

29
sino-activity/src/main/resources/mapper/activity/DrawRecordMapper.xml
View File

@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="SOURCE" column="SOURCE" /> <result property="SOURCE" column="SOURCE" />
<result property="PHONE" column="PHONE" /> <result property="PHONE" column="PHONE" />
<result property="EXTAREA" column="EXTAREA" /> <result property="EXTAREA" column="EXTAREA" />
<result property="PRIZENAME" column="PRIZENAME" />
</resultMap> </resultMap>
<sql id="selectDrawRecordVo"> <sql id="selectDrawRecordVo">
@ -78,7 +79,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectDrawRecordVo"/> <include refid="selectDrawRecordVo"/>
where DRAWRECORDID = #{DRAWRECORDID} where DRAWRECORDID = #{DRAWRECORDID}
</select> </select>
<select id="selectDrawRecordCodeUserList" parameterType="String" resultMap="DrawRecordResult">
SELECT
dr.*, pi.PRIZENAME
FROM
draw_record dr
LEFT JOIN draw_prize_info pi ON dr.PRIZECODE = pi.PRIZECODE
WHERE
dr.drawResult != '0'
AND dr.DRAWCODE = #{drawCode}
AND dr.USERID = #{userId}
order by dr.CREATETIMESTAMP desc
</select>
<select id="selectDrawRecordCodeList" parameterType="String" resultMap="DrawRecordResult">
SELECT
dr.*, pi.PRIZENAME
FROM
draw_record dr
LEFT JOIN draw_prize_info pi ON dr.PRIZECODE = pi.PRIZECODE
WHERE
dr.DRAWRESULT != '0'
AND dr.DRAWCODE = #{drawCode}
order by dr.CREATETIMESTAMP desc
LIMIT 100
</select>
<insert id="insertDrawRecord" parameterType="DrawRecord"> <insert id="insertDrawRecord" parameterType="DrawRecord">
insert into draw_record insert into draw_record
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">