前段奖品修改地址

This commit is contained in:
xu0625 2021-04-25 15:12:31 +08:00
parent 99ab1aaab7
commit fbeb9fdee3
19 changed files with 695 additions and 57 deletions

View File

@ -25,14 +25,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
@ -169,7 +167,7 @@ public class DrawController {
body.setUserId(openid);
body.setUserType("01");
body.setUserName(userName);
body.setDrawTime(DateUtils.dateTimeNow(DateUtils.YYYYMMDDHHMMSSS));
body.setDrawTime(DateUtils.dateTimeNow(DateUtils.YYYYMMDDHHMMSS));
body.setMerchantCode("MerchantCode");
body.setMerchantSysCode("MerchantSysCode");
body.setBusinessArea("6");
@ -183,7 +181,13 @@ public class DrawController {
return result;
}
@RequestMapping(value="/info.action", method = RequestMethod.POST)
/**
* 查询填写信息活动配置
* @param request
* @param actCode
* @return
*/
@RequestMapping(value="/info", method = RequestMethod.POST)
@ResponseBody
public ActPageConfigUserinfoResult info(HttpServletRequest request, String actCode) {
ActPageConfigUserinfoResult result = new ActPageConfigUserinfoResult();
@ -208,16 +212,21 @@ public class DrawController {
try {
HttpSession session = request.getSession();
WxOAuth2UserInfo userInfo = getUserInfo(request, null);
/* if (userInfo == null && !"1".equals(isAll)) {
WxOAuth2UserInfo userInfo = this.getUserInfo(request, null);
if (userInfo == null) {
result.setRespCode("-2");
result.setRespMsg("会话已失效,请重新登录");
logger.info("DrawController.prizes openid is null");
return result;
}
if (userInfo == null && !"1".equals(isAll)) {
result.setRecord(prizes);
return result;
}*/
}
String userId ="";
/* if (!"1".equals(isAll)) {
Long userId1 = ShiroUtils.getUserId();
if (!"1".equals(isAll)) {
userId = userInfo.getOpenid();
}*/
}
List<DrawRecord> drawRecords = iDrawRecordService.selectDrawRecordCodeList(drawCode, userId);
for (DrawRecord draw: drawRecords) {
String mobile = draw.getPHONE();
@ -297,13 +306,51 @@ public class DrawController {
}
return result;
}
/**
* 新增发奖记录以及地址
* @param request
* @param userInfo
* @return
*/
@RequestMapping(value="/saveAddress", method = RequestMethod.POST)
@ResponseBody
public Result saveAddress(HttpServletRequest request, DrawUserInfo userInfo) {
Result result = new Result();
try {
userInfo.setCreateTime(new Date());
HttpSession session = request.getSession();
WxOAuth2UserInfo user = this.getUserInfo(request, null);
if (user == null) {
result.setRespCode("-2");
result.setRespMsg("会话已失效,请重新登录");
logger.info("DrawController.saveAddress openid is null");
return result;
}
userInfo.setUserId(user.getOpenid());
if (StringUtils.isBlank(userInfo.getUserName())) {
result.setRespCode("-4");
result.setRespMsg("请输入姓名");
return result;
}
if (StringUtils.isBlank(userInfo.getAddress())) {
result.setRespCode("-4");
result.setRespMsg("请输入地址");
return result;
}
if (StringUtils.isBlank(userInfo.getGender())) {
result.setRespCode("-4");
result.setRespMsg("请输姓名");
return result;
}
if (StringUtils.isBlank(userInfo.getMobile())) {
result.setRespCode("-4");
result.setRespMsg("请输手机号");
return result;
}
iDrawUserInfoService.insertDrawUserInfo(userInfo);
result.setRespCode("1");
result.setRespMsg("新增成功");
} catch (Exception e) {
result.setRespCode("-1");
result.setRespMsg("系统异常,请稍后再试");
@ -312,6 +359,53 @@ public class DrawController {
return result;
}
@RequestMapping(value="/etidAddress", method = RequestMethod.POST)
@ResponseBody
public Result etidAddress(HttpServletRequest request, DrawUserInfo userInfo) {
Result result = new Result();
try {
HttpSession session = request.getSession();
WxOAuth2UserInfo user = this.getUserInfo(request, null);
if (user == null) {
result.setRespCode("-2");
result.setRespMsg("会话已失效,请重新登录");
logger.info("DrawController.etidAddress openid is null");
return result;
}
userInfo.setUserId(user.getOpenid());
if (StringUtils.isBlank(userInfo.getUserName())) {
result.setRespCode("-4");
result.setRespMsg("请输入姓名");
return result;
}
if (StringUtils.isBlank(userInfo.getAddress())) {
result.setRespCode("-4");
result.setRespMsg("请输入地址");
return result;
}
if (StringUtils.isBlank(userInfo.getGender())) {
result.setRespCode("-4");
result.setRespMsg("请输姓名");
return result;
}
if (StringUtils.isBlank(userInfo.getMobile())) {
result.setRespCode("-4");
result.setRespMsg("请输手机号");
return result;
}
iDrawUserInfoService.updateDrawUserInfo(userInfo);
result.setRespCode("1");
result.setRespMsg("成功");
} catch (Exception e) {
result.setRespCode("-1");
result.setRespMsg("系统异常,请稍后再试");
logger.error("DrawController.saveAddress ex: ", e);
}
return result;
}
/**
* 获取活动配置展示信息根据活动编码
* todo 判断活动状态
@ -361,6 +455,7 @@ public class DrawController {
public ActPageConfigSubscribeResult qrcode(HttpServletRequest request, String actCode) {
ActPageConfigSubscribeResult result = new ActPageConfigSubscribeResult ();
try {
List<ActPageConfigSubscribe> list = new ArrayList<>();
ActPageConfigSubscribe subscribe = iActPageConfigSubscribeService.selectActPageConfigSubscribeByCode(actCode);
@ -390,4 +485,24 @@ public class DrawController {
return result;
}
@RequestMapping(value="/listAddress", method = RequestMethod.POST)
@ResponseBody
public Result etidAddress(HttpServletRequest request , String awarDrecordId ){
DrawUserInfoResult result = new DrawUserInfoResult();
try{
DrawUserInfo drawUserInfo = iDrawUserInfoService.selectDrawUserInfoById(awarDrecordId);
result.setDrawUserInfo(drawUserInfo);
}catch (Exception e){
result.setRespCode("-1");
result.setRespMsg("系统异常,请稍后再试");
logger.error("DrawController.etidAddress ex: ", e);
}
return result;
}
}

View File

@ -0,0 +1,22 @@
package com.ruoyi.web.vo.draw;
import com.ruoyi.web.vo.Result;
import com.sinosoft.activity.domain.DrawUserInfo;
/**
* @author xlh
* @date 2021/4/23
*/
public class DrawUserInfoResult extends Result {
private DrawUserInfo drawUserInfo;
public DrawUserInfo getDrawUserInfo() {
return drawUserInfo;
}
public void setDrawUserInfo(DrawUserInfo drawUserInfo) {
this.drawUserInfo = drawUserInfo;
}
}

View File

@ -27,7 +27,7 @@
$.ajax({
type: "POST",
async: false,
url: contextRootPath + "/draw/info.action",
url: contextRootPath + "/draw/info",
data: {actCode: drawCode},
dataType: "json",
success: function (data) {
@ -62,7 +62,7 @@
$("#agentGender").attr('type','text')
}
if (data.actPageConfigUserinfo[0].agentNo=='on'){
document.getElementById("agentNo").style.display="block";
$("#agentNo").attr('type','text')
}
},
error: function (XMLHttpRequest, textStatus, errorThrown) {
@ -94,7 +94,7 @@
<input placeholder="性别" class="gender" name="gender" height="10px" type="hidden" id="gender">
<textarea placeholder="地址" class="address" name="address" style="display:none;" id="address"></textarea>
<textarea placeholder="地址" class="addr" name="address" style="display:none;" id="address"></textarea>
<input placeholder="代理人姓名" class="agentName" name="agentName" type="hidden" id="agentName">
@ -102,7 +102,7 @@
<input placeholder="代理人性别" class="agentGender" name="agentGender" type="hidden" id="agentGender">
<input placeholder="代理人工号" class="agentNo" name="agentNo" style="display:none;" id="agentNo">
<input placeholder="代理人工号" class="agentNo" name="agentNo" type="hidden" id="agentNo">
<div>
<input type="checkbox" id="protocol"checked="checked" >
<a onclick="pro()" >点击查看协议</a>

View File

@ -0,0 +1,229 @@
<!DOCTYPE html>
<html>
<head>
<meta name="viewport"
content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
<meta charset="UTF-8">
<meta name="format-detection" content="telephone=no" />
<title>活动</title>
<link rel="stylesheet" href="../draw/css/reset.css">
<link rel="stylesheet" href="../draw/css/style.css">
<link rel="stylesheet" type="text/css" href="../draw/css/popup.css"/>
<link rel="stylesheet" type="text/css" href="../draw/css/myPrize.css"/>
<link rel="stylesheet" type="text/css" href="../draw/css/register.css"/>
<link rel="stylesheet" type="text/css" href="../draw/css/winPrize.css"/>
<link rel="stylesheet" type="text/css" href="../draw/css/goods.css"/>
<link rel="stylesheet" type="text/css" href="../draw/css/rule.css"/>
<link rel="stylesheet" type="text/css" href="css/address.css">
<script src="/js/config.js"></script>
<link rel="stylesheet" href="../draw/css/main.css">
<script src="../draw/js/jquery-1.9.1.min.js"></script>
<script src="../draw/js/awardRotate.js"></script>
<script src="../draw/js/util.js"></script>
<script src="../draw/js/draw.js"></script>
<script>
$(document).ready(function () {
$.ajax({
type: "POST",
async: false,
url: contextRootPath + "/draw/info",
data: {actCode: drawCode},
dataType: "json",
success: function (data) {
//todo 根据风格改变css样式
$(".act_guide").attr("background",data.actPageConfigUserinfo[0].bgImg);
$("#titlePri").text(data.actPageConfigUserinfo[0].title);
$("#describePri").text(data.actPageConfigUserinfo[0].description);
$("#agreementPri").val(data.actPageConfigUserinfo[0].agreement);
$("#btnPri").text(data.actPageConfigUserinfo[0].btnText);
if (data.actPageConfigUserinfo[0].mobile=='on'){
$("#phonePri").attr('type','text')
}
if (data.actPageConfigUserinfo[0].mobile=='on'){
$("#phone").attr('type','text')
}
if (data.actPageConfigUserinfo[0].userName=='on'){
$("#name").attr('type','text')
}
if (data.actPageConfigUserinfo[0].gender=='on'){
$("#gender").attr('type','text')
}
if (data.actPageConfigUserinfo[0].address=='on'){
document.getElementById("address").style.display="block";
}
if (data.actPageConfigUserinfo[0].agentName=='on'){
$("#agentName").attr('type','text')
}
if (data.actPageConfigUserinfo[0].agentMobile=='on'){
$("#agentMobile").attr('type','text')
}
if (data.actPageConfigUserinfo[0].agentGender=='on'){
$("#agentGender").attr('type','text')
}
if (data.actPageConfigUserinfo[0].agentNo=='on'){
$("#agentNo").attr('type','text')
}
},
error: function (XMLHttpRequest, textStatus, errorThrown) {
console.log('网络异常', textStatus, errorThrown);
}
});
$.ajax({
type: "POST",
async: false,
url: contextRootPath + "/draw/listAddress",
data: {awarDrecordId: awardrecordid},
dataType: "json",
success: function (data) {
console.log(data)
if(data.drawUserInfo!=null){
if (data.drawUserInfo.awarDrecordId!=null ){
$("#awarDrecordId").val(data.drawUserInfo.awarDrecordId)
}
if (data.drawUserInfo.mobile!=null){
$("#phone").val(data.drawUserInfo.mobile)
}
if (data.drawUserInfo.userName!=null){
$("#name").val(data.drawUserInfo.userName)
}
if (data.drawUserInfo.gender!=null){
$("#gender").val(data.drawUserInfo.gender)
}
if (data.drawUserInfo.address!=null){
$("#address").text(data.drawUserInfo.address)
}
if (data.drawUserInfo.agentName!=null){
$("#agentName").val(data.drawUserInfo.agentName)
}
if (data.drawUserInfo.agentMobile!=null){
$("#agentMobile").val(data.drawUserInfo.agentMobile)
}
if (data.drawUserInfo.agentGender!=null){
$("#agentGender").val(data.drawUserInfo.agentGender)
}
if (data.drawUserInfo.agentNo!=null){
$("#agentNo").val(data.drawUserInfo.agentNo)
}
}
},
error: function (XMLHttpRequest, textStatus, errorThrown) {
console.log('网络异常', textStatus, errorThrown);
}
});
});
</script>
</head>
<body class="template_bg popupBox act_guide" style="background-color: #fbdaaf;
background-repeat:no-repeat;
background-attachment:fixed;
background-size:100% 100%;">
<form id="etid" >
<div class='popup address'>
<div class='popupMin'>
<div class='cont'>
<div id="titlePri"></div>
<div id="describePri"></div>
<div >请填写您的基本信息</div>
<input placeholder="姓名" name="userName" class="uname" type="hidden" id="name">
<input placeholder="手机号" class="phone" name="mobile" type="hidden" id="phone" maxlength="11">
<input placeholder="性别" class="gender" name="gender" height="10px" type="hidden" id="gender">
<textarea placeholder="地址" class="addr" name="address" style="display:none;" id="address"></textarea>
<input placeholder="代理人姓名" class="agentName" name="agentName" type="hidden" id="agentName">
<input placeholder="代理人手机号" class="agentMobile" name="agentMobile" type="hidden" id="agentMobile" maxlength="11">
<input placeholder="代理人性别" class="agentGender" name="agentGender" type="hidden" id="agentGender">
<input placeholder="代理人工号" class="agentNo" name="agentNo" type="hidden" id="agentNo">
<input class="awarDrecordId" name="awarDrecordId" type="hidden" id="awarDrecordId">
<div>
<input type="checkbox" id="protocol"checked="checked" >
<a onclick="pro()" >点击查看协议</a>
<input id="agreementPri" type="hidden">
</div>
<button type="button" id="btnPri" class='button' onclick="etidAddr()"></button>
</div>
</div>
</div>
</form>
<!--登记 弹窗-->
<div class='popup register' style="display: none;">
<div class='popupMin'>
<img src="../draw/images/top01.png" class='top'>
<div class='popCont'>
<div class='left'></div>
<div class='cont'>
<img src="../draw/images/success.png" >
<div>信息登记成功</div>
<div>奖品将在活动结束后四十个工作日寄送</div>
<div type="button" class='button' onclick="qrCode()">确定</div>
</div>
<div class='right'></div>
</div>
<img src="../draw/images/popupList04.png" class='bottom'>
</div>
<img src="../draw/images/delect.png" class='popDelect regDelect'>
</div>
<div class="tip_copy " style="display: none;">
<p></p>
</div>
<!--活动规则-->
<div class='popup rule' style="display: none;">
<div class='popupMin'>
<img src="../draw/images/top02.png" class='top'>
<div class='popCont'>
<div class='left'></div>
<div class='cont'>
<div>
<img src="../draw/images/left.png">
<div>协议内容</div>
<img src="../draw/images/right.png">
</div>
<ul class='contBox' style="list-style: inside;">
</ul>
</div>
<div class='right'></div>
</div>
<img src="../draw/images/popupList04.png" class='bottom'>
</div>
<img src="../draw/images/delect.png" class='popDelect ruleDelect'>
<span style='clear: both;'></span>
</div>
<script src="../draw/js/main.js"></script>
<script src="../draw/js/scroll.js"></script>
<script src="../draw/js/common.js"></script>
</body>
<script>
function qrCode(){
window.location.href='subscribe.html?drawCode='+drawCode;
}
function pro() {
var e = $("#agreementPri").val();
var desc = removeHTMLTag(e);
var desc1 = escape2Html(desc);
$('.contBox').append(desc1);
$('.rule').show();
}
</script>
</html>

View File

@ -92,7 +92,13 @@
<li class="award">恭喜 151****3445 获得京东E卡</li>
</ul>
<ul class="" style="display: none;">
<li class="prize_li"><img src="images/img_prize01.png" /><span class="pname">50积分</span><span class="list_date time">2020-11-23</span></li>
<li class="prize_li" >
<!-- <img src="images/img_prize01.png" />-->
<span class="pname">50积分</span>
<span class="time">2020-11-23</span>
<span class="awar" style="display: none;"></span>
<span class="but" onclick="etidAddress(this)"></span>
</li>
</ul>
<script src="js/jquery-1.11.0.min.js"></script>
<script src="js/common.js"></script>
@ -100,7 +106,6 @@
<script src="js/iosSelect.js"></script>
<script src="js/areaData_v2.js" charset="GBK"></script>
<script src="../draw/js/util.js"></script>
<script src="../draw/js/util.js"></script>
<script src="js/main.js"></script>
<script>
const DOLL = 'doll';
@ -226,6 +231,13 @@
// location.href = contextRootPath+'/wechat/user/toPension.do?ak=pensionSecond';
location.href = contextRootPath+'/activity/tree/index.html?showTask=1&cl='+cl;
})
function etidAddress(val){
var awardrecordid = val.id;
window.location.href='../act/etid.html?drawCode='+drawCode+'&awardrecordid='+awardrecordid;
}
</script>
</body>
</html>

View File

@ -123,14 +123,20 @@ function myprizes(facade) {
return;
}
$.each(prizes, function (i, n) {
let ptype = n.prizetype;
if('materialObject' == n.prizetype){
let ptype = n.prizetype;
let status = n.status;
let prizeCode = n.prizecode;
let prize = $('.prize_li').clone();
prize.show();
prize.removeClass('prize_li');
prize.find('.pname').html(n.prizename);
prize.find('.time').html(n.createtimestamp);
prize.find('.awar').html(n.awardrecordid);
prize.find('.but').html('收货地址');
prize.find('.but').attr('id',n.awardrecordid);
let imgSrc = $('img[p-code=' + prizeCode + ']').attr('src');
prize.find("img").attr('src', imgSrc);
let link = n.link;
@ -140,9 +146,34 @@ function myprizes(facade) {
});
}
$(prize).attr('val', prizeCode);
$(prize).attr('flow', n.drawtranseqno);
$(prize).attr('id', n.drawtranseqno);
$(prize).attr('ptype', ptype);
$('.myPrizes').append(prize);
}else{
let ptype = n.prizetype;
let status = n.status;
let prizeCode = n.prizecode;
let prize = $('.prize_li').clone();
prize.show();
prize.removeClass('prize_li');
prize.find('.pname').html(n.prizename);
prize.find('.time').html(n.createtimestamp);
let imgSrc = $('img[p-code=' + prizeCode + ']').attr('src');
prize.find("img").attr('src', imgSrc);
let link = n.link;
if (link) {
prize.on('click', function () {
location.href = link;
});
}
$(prize).attr('val', prizeCode);
$(prize).attr('id', n.drawtranseqno);
$(prize).attr('ptype', ptype);
$('.myPrizes').append(prize);
}
});
},
error: function (XMLHttpRequest, textStatus, errorThrown) {

View File

@ -372,6 +372,16 @@
font-size: 0.6rem;
color: #f9edc7;
}
.zk_red_box .zk_red_box_header .scratch_off_box p.again_btn1{
width: 4.62rem;
height: 1.36rem;
background: url(../images/icon_again_bg.png) no-repeat center center;
background-size: 100%;
margin: 0 auto;
line-height: 1.6rem;
font-size: 0.6rem;
color: #f9edc7;
}
/* 민쉽榴檄---呵겨 */
.zk_red_box .zk_red_box_header .scratch_off_box.fail p:first-child{
margin-top: 1.26rem;

View File

@ -1,5 +1,6 @@
var drawCode = getParameter('drawCode');
var prizeType = null;
var awardrecordid = getParameter('awardrecordid');
var prizeType = "materialObject";
var prizeCode = null;
function rtn() {
let rtnBtn = getParameter('rtn');
@ -63,18 +64,38 @@ function myprizes() {
}
console.log(data.record);
$.each(data.record, function (i, n) {
if('materialObject' == n.prizetype){
var ptype = n.prizetype;
var status = n.status;
var iscenter = 0;
var record = $('.prize_li').clone();
var but = $('.but').clone();
$(record).css('display', 'inherit');
record.removeClass('prize_li');
record.removeClass('but');
record.find('.pname').html(n.prizename)
record.find('.time').html(n.createtimestamp);
record.find('.but').html('收货地址');
record.find('.but').attr('id',n.awardrecordid);
$(record).attr('val', n.prizecode);
$(record).attr('flow', n.drawtranseqno);
$(record).attr('ptype', n.prizetype);
$('.popList').append(record);
}else{
var ptype = n.prizetype;
var status = n.status;
var iscenter = 0;
var record = $('.prize_li').clone();
$(record).css('display', 'inherit');
record.removeClass('prize_li');
record.find('.pname').html(n.prizename);
record.find('.pname').html(n.prizename)
record.find('.time').html(n.createtimestamp);
record.find('.awar').html(n.awardrecordid);
$(record).attr('val', n.prizecode);
$(record).attr('flow', n.drawtranseqno);
$(record).attr('ptype', n.prizetype);
$('.popList').append(record);
}
});
},
error: function (XMLHttpRequest, textStatus, errorThrown) {
@ -157,10 +178,10 @@ function saveAddr() {
tip('请勾选协议');
return ;
}
var uname = $('.uname').val();
var phone = $('.phone').val();
var addr = $('.addr').val();
var gender = $('.gender').val();
if ('integral' == prizeType) {
} else if ('materialObject' == prizeType) {
if (!uname) {
@ -175,12 +196,17 @@ function saveAddr() {
tip('请输入收货人地址');
return;
}
if (!gender) {
tip('请输入收货人性别');
return;
}
} else {
}
var flow = $('.flow').val();
var flow = this.id;
alert(flow)
/* uname = getEntryptPwd(uname);
phone = getEntryptPwd(phone);*/
var data = $("#addressId").serialize();
var data = $.param({'drawCode':drawCode,'flow':flow})+'&'+$("#addressId").serialize();
$.ajax({
url: contextRootPath+"/draw/saveAddress",
dataType: "json",
@ -191,13 +217,71 @@ function saveAddr() {
if ('integral' == prizeType) {
} else if ('materialObject' == prizeType) {
$('.register').show();
} else {
}
$('.register').show();
} else {
tip(data.respMsg);
}
},
error: function (XMLHttpRequest, textStatus, errorThrown) {
console.log('网络异常', textStatus, errorThrown);
}
});
}
function etidAddr() {
var boolean = $("#protocol").prop("checked");
if (!boolean){
tip('请勾选协议');
return ;
}
var uname = $('.uname').val();
var phone = $('.phone').val();
var addr = $('.addr').val();
var gender = $('.gender').val();
if ('integral' == prizeType) {
} else if ('materialObject' == prizeType) {
if (!uname) {
tip('请输入收货人姓名');
return;
}
if (!phone) {
tip('请输入收货人手机号码');
return;
}
if (!addr) {
tip('请输入收货人地址');
return;
}
if (!gender) {
tip('请输入收货人性别');
return;
}
} else {
}
/* uname = getEntryptPwd(uname);
phone = getEntryptPwd(phone);*/
var data = $("#etid").serialize();
$.ajax({
url: contextRootPath+"/draw/etidAddress",
dataType: "json",
type: "post",
data: data,
success: function(data){
if (data.respCode == '1') {
if ('integral' == prizeType) {
} else if ('materialObject' == prizeType) {
$('.register').show();
} else {
}
$('.register').show();
} else {
tip(data.respMsg);
}
},

View File

@ -58,6 +58,10 @@
<p>大奖离你还差一点儿,加油</p>
<p class="again_btn">再抽一次</p>
</div>
<div style="display: none;" class="scratch_off_box fail">
<p>恭喜你获得,戴风吹风机</p>
<p onclick="qrCode()" class="again_btn1">领取</p>
</div>
<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>推荐客户获取更多抽奖机会吧~</p>
@ -66,9 +70,6 @@
<div class="zk_red_box_footer">
<p>今日有机会刮出</p>
</div>
</div>
<!-- 获奖人 -->
<div class="lucy_info">
@ -100,6 +101,7 @@
<div>
<div>抽中奖品</div>
<div>获奖时间</div>
<div>地址管理</div>
</div>
</div>
<div class='popList'>
@ -112,9 +114,11 @@
</div>
<img src="images/delect.png" class='popDelect prizeDelect'>
</div>
<div class="prize_li" style="display: none;">
<div class="pname">奖品名称</div>
<div class="prize_li" style="display: none;" >
<div class="pname" >奖品名称</div>
<div class="time">2020/08/05 09:00</div>
<div class="awar" style="display: none"></div>
<div type="button"class="but" onclick="etidAddress(this)"></div>
</div>
<!--活动规则-->
<div class='popup rule' style="display: none;">
@ -129,18 +133,7 @@
<img src="images/right.png">
</div>
<ul class='contBox' style="list-style: inside">
<!-- <li class='content'><3E>ʱ<EEB6AF>䣺2020<32><30>10<31><30>29<32><39>-12<EFBFBD><EFBFBD>31<EFBFBD>ա<EFBFBD></li>-->
<!-- <li class='content'><3E><EFBFBD>ڼ䣬<DABC>ͻ<EFBFBD><CDBB>Ƽ<EFBFBD><C6BC>ͻ<EFBFBD>ʹ<EFBFBD><CAB9>һ<EFBFBD><D2BB>ͨ<EFBFBD><CDA8><EFBFBD>֧<EFBFBD><D6A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ʋ<EFBFBD>Ʒ<EFBFBD><C6B7><EFBFBD><EFBFBD><EFBFBD>ֻ<EFBFBD><D6BB><EFBFBD>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɷѣ<C9B7><D1A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɻ<EFBFBD><C9BB>һ<EFBFBD>κ<EFBFBD><CEBA><EFBFBD><EFBFBD><E9BDB1><EFBFBD><EFBFBD>н<EFBFBD><D0BD><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'><3E><>Ʒ<EFBFBD>ֽ<EFBFBD><D6BD><EFBFBD>29400<30><30><EFBFBD><EFBFBD><EFBFBD>н<EFBFBD><D0BD><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'><3E><><EFBFBD>ս<EFBFBD>Ʒ<EFBFBD><C6B7><EFBFBD><EFBFBD>Իʵ<EEB6AF><CAB5><EFBFBD><EFBFBD><EFBFBD>Ϊ׼<CEAA><D7BC><EFBFBD>й<EFBFBD><D0B9><EFBFBD><EFBFBD>ٱ<EFBFBD><D9B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ؽ<EFBFBD>Ʒ<EFBFBD><C6B7><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><C8A8><EFBFBD><EFBFBD><EFBFBD>Ʒ<E7BDB1><C6B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͨ<EFBFBD><CDA8><EFBFBD><EFBFBD>ҳ<EEB6AF><D2B3><EFBFBD><EFBFBD>й<EFBFBD>ʾ<EFBFBD><CABE></li>-->
<!-- <li class='content'><3E>н<EFBFBD><D0BD><EFBFBD><EFBFBD>û<EFBFBD><C3BB>輰ʱ<E8BCB0><CAB1>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><E1BDBB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȡ<EFBFBD><C8A1>Ϣ<EFBFBD><CFA2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><ECBDB1>Ϣ<EFBFBD><CFA2><EFBFBD>󡢲<EFBFBD><F3A1A2B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>½<EFBFBD>Ʒδ<C6B7>ܼ<EFBFBD>ʱ<EFBFBD><CAB1>á<EFBFBD><C3A1>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ţ<EFBFBD><C5A3><EFBFBD><EFBFBD><EEB6AF><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD>δ<EFBFBD><CEB4>ȡ<EFBFBD><C8A1>Ʒ<EFBFBD><C6B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ý<EFBFBD>Ʒ<EFBFBD><C6B7></li>-->
<!-- <li class='content'><3E>û<EFBFBD><C3BB>μӻ<D3BB><EEB6AF><EFBFBD><EFBFBD>Ϊ<EFBFBD><CEAA>ͬ<E2B2A2><EFBFBD><EFBFBD><EEB6AF><EFBFBD><EFBFBD></li>-->
<!-- <li class='content'><3E>Ի<D4BB><EEB6AF><EFBFBD>κ<EFBFBD><CEBA><EFBFBD><EFBFBD>ʣ<EFBFBD><CAA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EEB6AF>ҳ<EFBFBD><D2B3><EFBFBD>Ŀͷ<C4BF>ͼ<EFBFBD><CDBC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѯ<EFBFBD><D1AF>Ҳ<EFBFBD><D2B2><EFBFBD><EFBFBD>ϵ<EFBFBD>й<EFBFBD><D0B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߿ͷ<DFBF><CDB7><EFBFBD><EFBFBD><EFBFBD>ע<EFBFBD><D7A2><EFBFBD>й<EFBFBD><D0B9><EFBFBD><EFBFBD>ٱ<EFBFBD><D9B1>ա<EFBFBD>΢<EFBFBD>Ź<EFBFBD><C5B9>ںţ<DABA><C5A3>ڶԻ<DAB6><D4BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>롰0<EBA1B0><30><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>롰2<EBA1B0><32><EFBFBD><EFBFBD><EFBFBD>ɣ<EFBFBD><C9A3><EFBFBD></li>-->
<!-- <li class='content'><3E><>Ʋ<EFBFBD>Ʒ<EFBFBD><C6B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD><CFB1>ϡ<EFBFBD><CFA1>ֽ𱦡<D6BD><F0B1A6A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ʒ<EFBFBD><C6B7></li>-->
<!-- <li class='content'><3E>ڲ<EFBFBD><DAB2><EFBFBD><EFBFBD>Ĺ<EFBFBD><C4B9><EFBFBD><EFBFBD>У<EFBFBD><D0A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Υ<EFBFBD><CEA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><CEAA>Υ<EFBFBD><CEA5><EFBFBD><EFBFBD><EEB6AF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ж<EFBFBD><D0B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD>й<EFBFBD><D0B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ׷<C8A8>ؽ<EFBFBD><D8BD><EFBFBD><EFBFBD><EFBFBD>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ<CEBB><EEB6AF><EFBFBD>ʸ<EFBFBD>׷<EFBFBD><D7B7><EFBFBD><EFBFBD><E4B7A8><EFBFBD><EFBFBD><EFBFBD>Ρ<EFBFBD></li>-->
<!-- <li class='content'><3E><><EFBFBD><EFBFBD><EEB6AF><EFBFBD>ս<EFBFBD><D5BD><EFBFBD>Ȩ<EFBFBD><C8A8><EFBFBD>й<EFBFBD><D0B9><EFBFBD><EFBFBD>ٵ<EFBFBD><D9B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޹<EFBFBD>˾<EFBFBD><CBBE><EFBFBD>У<EFBFBD><D0A3>й<EFBFBD><D0B9><EFBFBD><EFBFBD>ٵ<EFBFBD><D9B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޹<EFBFBD>˾<EFBFBD><CBBE><EFBFBD><EFBFBD><EFBFBD>޸<EFBFBD><DEB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><C8A8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڷ<EFBFBD><DAB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̶<EFBFBD><CCB6><EFBFBD>ʹ<EFBFBD>á<EFBFBD></li>-->
<!-- <li class='content'><3E><><EFBFBD><EFBFBD><EEB6AF>ƻ<EFBFBD><C6BB><EFBFBD><EFBFBD>˾<EFBFBD>޹ء<DEB9></li>-->
<!-- <li class='content'><3E><>Ʒ<EFBFBD><C6B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޣ<EFBFBD><DEA3>ȵ<EFBFBD><C8B5>ȵá<C8B5></li>-->
</ul>
</div>
@ -371,6 +364,20 @@
})();
prizes();
function qrCode(){
window.location.href='../act/address.html?drawCode='+drawCode;
}
function etidAddress(val){
var awardrecordid = val.id;
var drawCode = this.drawCode;
window.location.href='../act/etid.html?drawCode='+drawCode+'&awardrecordid='+awardrecordid;
}
</script>
</body>

View File

@ -328,6 +328,7 @@
<div>
<div>抽中奖品</div>
<div>获奖时间</div>
<div>地址管理</div>
</div>
</div>
<div class='popList'>
@ -340,9 +341,12 @@
</div>
<img src="images/delect.png" class='popDelect prizeDelect'>
</div>
<div class="prize_li" style="display: none;">
<div class="pname">奖品名称</div>
<div class="time">2020/08/05 09:00</div>
<div class="prize_li" style="display: none;" >
<div class="pname" >奖品名称</div>
<div class="time">2020/08/05 09:00</div>
<div class="awar" style="display: none"></div>
<div type="button" class="but" onclick="etidAddress(this)"></div>
</div>
<!--登记 弹窗-->
<div class='popup register' style="display: none;">
@ -446,8 +450,16 @@
prizes();
function qrCode(){
window.location.href='../act/address.html?drawCode='+drawCode;
}
function etidAddress(val){
var awardrecordid = val.id;
var drawCode = this.drawCode;
window.location.href='../act/etid.html?drawCode='+drawCode+'&awardrecordid='+awardrecordid;
}
</script>
</body>

View File

@ -94,6 +94,16 @@ public class DrawRecord extends BaseEntity
/** 奖品名称*/
private String PRIZENAME;
private String AWARDRECORDID;
public String getAWARDRECORDID() {
return AWARDRECORDID;
}
public void setAWARDRECORDID(String AWARDRECORDID) {
this.AWARDRECORDID = AWARDRECORDID;
}
public String getPRIZENAME() {
return PRIZENAME;
}

View File

@ -17,7 +17,7 @@ public class DrawUserInfo extends BaseEntity
private static final long serialVersionUID = 1L;
/** id */
private Long awarDrecordId;
private String awarDrecordId;
/** 姓名 */
@Excel(name = "姓名")
@ -51,12 +51,42 @@ public class DrawUserInfo extends BaseEntity
@Excel(name = "代理人工号")
private String agentNo;
public void setAwarDrecordId(Long awarDrecordId)
private String drawCode;
private String flow;
private String userId;
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getFlow() {
return flow;
}
public void setFlow(String flow) {
this.flow = flow;
}
public String getDrawCode() {
return drawCode;
}
public void setDrawCode(String drawCode) {
this.drawCode = drawCode;
}
public void setAwarDrecordId(String awarDrecordId)
{
this.awarDrecordId = awarDrecordId;
}
public Long getAwarDrecordId()
public String getAwarDrecordId()
{
return awarDrecordId;
}

View File

@ -75,4 +75,12 @@ public interface DrawRecordMapper
* @return
*/
List<DrawRecord> selectDrawRecordCodeList(String drawCode);
/**
* 根据userid 查询信息
* @param drawRecord
* @return
*/
public DrawRecord selectDrawRecordUserIdList(DrawRecord drawRecord);
}

View File

@ -18,7 +18,7 @@ public interface DrawUserInfoMapper
* @param awarDrecordId 用户信息收集页面ID
* @return 用户信息收集页面
*/
public DrawUserInfo selectDrawUserInfoById(Long awarDrecordId);
public DrawUserInfo selectDrawUserInfoById(String awarDrecordId);
/**
* 查询用户信息收集页面列表

View File

@ -18,7 +18,7 @@ public interface IDrawUserInfoService
* @param awarDrecordId 用户信息收集页面ID
* @return 用户信息收集页面
*/
public DrawUserInfo selectDrawUserInfoById(Long awarDrecordId);
public DrawUserInfo selectDrawUserInfoById(String awarDrecordId);
/**
* 查询用户信息收集页面列表

View File

@ -2,7 +2,11 @@ package com.sinosoft.activity.service.impl;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.DateUtils;
import com.sinosoft.activity.domain.DrawAwardRecord;
import com.sinosoft.activity.domain.DrawRecord;
import com.sinosoft.activity.domain.DrawUserInfo;
import com.sinosoft.activity.mapper.DrawAwardRecordMapper;
import com.sinosoft.activity.mapper.DrawRecordMapper;
import com.sinosoft.activity.mapper.DrawUserInfoMapper;
import com.sinosoft.activity.service.IDrawUserInfoService;
import org.springframework.beans.factory.annotation.Autowired;
@ -22,6 +26,10 @@ public class DrawUserInfoServiceImpl implements IDrawUserInfoService
@Autowired
private DrawUserInfoMapper drawUserInfoMapper;
@Autowired
private DrawRecordMapper drawRecordMapper;
@Autowired
private DrawAwardRecordMapper drawAwardRecordMapper;
/**
* 查询用户信息收集页面
*
@ -29,7 +37,7 @@ public class DrawUserInfoServiceImpl implements IDrawUserInfoService
* @return 用户信息收集页面
*/
@Override
public DrawUserInfo selectDrawUserInfoById(Long awarDrecordId)
public DrawUserInfo selectDrawUserInfoById(String awarDrecordId)
{
return drawUserInfoMapper.selectDrawUserInfoById(awarDrecordId);
}
@ -56,6 +64,35 @@ public class DrawUserInfoServiceImpl implements IDrawUserInfoService
public int insertDrawUserInfo(DrawUserInfo drawUserInfo)
{
drawUserInfo.setCreateTime(DateUtils.getNowDate());
DrawRecord drawRecord = new DrawRecord();
/* drawRecord.setDRAWCODE("20200805223654039");
drawRecord.setUSERID("7709828507406032");
drawRecord.setDRAWTRANSEQNO("202010151647450600802021");*/
drawRecord.setDRAWCODE(drawUserInfo.getDrawCode());
drawRecord.setUSERID(drawUserInfo.getUserId());
drawRecord.setDRAWTRANSEQNO(drawUserInfo.getFlow());
DrawRecord gtDrawRecord = drawRecordMapper.selectDrawRecordUserIdList(drawRecord);
DrawAwardRecord drawAwardRecord = new DrawAwardRecord();
drawAwardRecord.setAWARDRESULT("1");
drawAwardRecord.setAWARDTIME(DateUtils.getNowDate());
drawAwardRecord.setDRAWCODE(gtDrawRecord.getDRAWCODE());
drawAwardRecord.setDRAWRECORDID(gtDrawRecord.getDRAWRECORDID());
drawAwardRecord.setDRAWTRANSEQNO(gtDrawRecord.getDRAWTRANSEQNO());
drawAwardRecord.setCREATETIMESTAMP(DateUtils.getNowDate());
drawAwardRecord.setLASTUPDATETIMESTAMP(DateUtils.getNowDate());
drawAwardRecord.setPRIZECODE(gtDrawRecord.getPRIZECODE());
drawAwardRecord.setRETURNMESSAGE("0000");
drawAwardRecord.setRETURNMESSAGE("成功");
drawAwardRecord.setUSERID("userId");
drawAwardRecord.setUSERNAME(gtDrawRecord.getUSERNAME());
drawAwardRecord.setPRIZELEVEL(gtDrawRecord.getPRIZELEVEL());
drawAwardRecord.setPRIZETYPE(gtDrawRecord.getPRIZETYPE());
drawAwardRecordMapper.insertDrawAwardRecord(drawAwardRecord);
gtDrawRecord.setDRAWRESULT("2");
drawRecordMapper.updateDrawRecord(gtDrawRecord);
drawUserInfo.setAwarDrecordId(drawAwardRecord.getAWARDRECORDID());
return drawUserInfoMapper.insertDrawUserInfo(drawUserInfo);
}

View File

@ -70,7 +70,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where AWARDRECORDID = #{AWARDRECORDID}
</select>
<insert id="insertDrawAwardRecord" parameterType="DrawAwardRecord">
<insert id="insertDrawAwardRecord" parameterType="DrawAwardRecord" useGeneratedKeys="true"
keyProperty="AWARDRECORDID">
insert into draw_award_record
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="AWARDRECORDID != null">AWARDRECORDID,</if>

View File

@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="PHONE" column="PHONE" />
<result property="EXTAREA" column="EXTAREA" />
<result property="PRIZENAME" column="PRIZENAME" />
<result property="AWARDRECORDID" column="AWARDRECORDID" />
</resultMap>
<sql id="selectDrawRecordVo">
@ -54,6 +55,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="params.start != null and params.start != ''"> limit #{params.start}, #{params.end}</if>
order by CREATETIMESTAMP desc
</select>
<select id="selectDrawRecordUserIdList" parameterType="DrawRecord" resultMap="DrawRecordResult">
<include refid="selectDrawRecordVo"/>
<where>
<if test="DRAWTRANSEQNO != null and DRAWTRANSEQNO != ''"> and DRAWTRANSEQNO = #{DRAWTRANSEQNO}</if>
<if test="DRAWCODE != null and DRAWCODE != ''"> and DRAWCODE = #{DRAWCODE}</if>
<if test="USERID != null and USERID != ''"> and USERID = #{USERID}</if>
<if test="DRAWTIME != null "> and DRAWTIME = #{DRAWTIME}</if>
<if test="DRAWRESULT != null and DRAWRESULT != ''"> and DRAWRESULT = #{DRAWRESULT}</if>
<if test="PRIZECODE != null and PRIZECODE != ''"> and PRIZECODE = #{PRIZECODE}</if>
<if test="PRIZETYPE != null and PRIZETYPE != ''"> and PRIZETYPE = #{PRIZETYPE}</if>
<if test="CHECKINGDATE != null "> and CHECKINGDATE = #{CHECKINGDATE}</if>
<if test="CREATETIMESTAMP != null "> and CREATETIMESTAMP = #{CREATETIMESTAMP}</if>
<if test="LASTUPDATETIMESTAMP != null "> and LASTUPDATETIMESTAMP = #{LASTUPDATETIMESTAMP}</if>
<if test="CHANNEL != null and CHANNEL != ''"> and CHANNEL = #{CHANNEL}</if>
<if test="USERNAME != null and USERNAME != ''"> and USERNAME like concat('%', #{USERNAME}, '%')</if>
<if test="PRIZELEVEL != null and PRIZELEVEL != ''"> and PRIZELEVEL = #{PRIZELEVEL}</if>
<if test="PROJECTCODE != null and PROJECTCODE != ''"> and PROJECTCODE = #{PROJECTCODE}</if>
<if test="SOURCE != null and SOURCE != ''"> and SOURCE = #{SOURCE}</if>
<if test="PHONE != null and PHONE != ''"> and PHONE = #{PHONE}</if>
<if test="EXTAREA != null and EXTAREA != ''"> and EXTAREA = #{EXTAREA}</if>
</where>
<if test="params.start != null and params.start != ''"> limit #{params.start}, #{params.end}</if>
order by CREATETIMESTAMP desc
</select>
<select id="selectDrawRecordCount" parameterType="DrawRecord" resultType="Long">
select count(*) from draw_record
@ -81,12 +106,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectDrawRecordCodeUserList" parameterType="String" resultMap="DrawRecordResult">
SELECT
aw.AWARDRECORDID,
dr.*, pi.PRIZENAME
FROM
draw_record dr
LEFT JOIN draw_prize_info pi ON dr.PRIZECODE = pi.PRIZECODE
WHERE
LEFT JOIN draw_award_record aw ON dr.DRAWRECORDID = aw.DRAWRECORDID
WHERE
dr.drawResult != '0'
AND dr.DRAWCODE = #{drawCode}
AND dr.USERID = #{userId}
@ -95,10 +121,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectDrawRecordCodeList" parameterType="String" resultMap="DrawRecordResult">
SELECT
aw.AWARDRECORDID,
dr.*, pi.PRIZENAME
FROM
draw_record dr
LEFT JOIN draw_prize_info pi ON dr.PRIZECODE = pi.PRIZECODE
LEFT JOIN draw_award_record aw ON dr.DRAWRECORDID = aw.DRAWRECORDID
WHERE
dr.DRAWRESULT != '0'
AND dr.DRAWCODE = #{drawCode}

View File

@ -38,7 +38,7 @@
</where>
</select>
<select id="selectDrawUserInfoById" parameterType="Long" resultMap="DrawUserInfoResult">
<select id="selectDrawUserInfoById" parameterType="String" resultMap="DrawUserInfoResult">
<include refid="selectDrawUserInfoVo"/>
where awarDrecordId = #{awarDrecordId}
</select>
@ -46,6 +46,7 @@
<insert id="insertDrawUserInfo" parameterType="DrawUserInfo">
insert into draw_user_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="awarDrecordId != null">awarDrecordId,</if>
<if test="userName != null">userName,</if>
<if test="mobile != null">mobile,</if>
<if test="gender != null">gender,</if>
@ -58,6 +59,7 @@
<if test="updateTime != null">updateTime,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="awarDrecordId != null">#{awarDrecordId},</if>
<if test="userName != null">#{userName},</if>
<if test="mobile != null">#{mobile},</if>
<if test="gender != null">#{gender},</if>