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

发放抽奖次数编写 

todo 逻辑完善
修改活动展示页按钮2效果
This commit is contained in:
dy 2021-04-20 09:34:35 +08:00
parent 940e2c3528
commit df4fffd3f9
21 changed files with 1363 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
ruoyi-common/src/main/java/com/ruoyi/common/constant/ActConstants.java Normal file
View File

@ -0,0 +1,116 @@
package com.ruoyi.common.constant;
import java.util.ArrayList;
import java.util.List;
/**
* TODO
*
* @author dy
* @version 1.0
* @date 2021/4/19 10:58
*/
public class ActConstants {
public static final String DATE_FORMAT1 = "yyyyMMddHHmmssSSS";
public static final String DATE_FORMAT2 = "yyyy-MM-dd-HH:mm:ss";
public static final String DATE_FORMAT3 = "yyyyMMdd";
public static final String DATE_FORMAT4 = "HHmmssSSS";
/** 任务完成通知记录状态 **/
/** 有效 **/
public static final String TASK_NOTIFY_RECORD_STATUS_EFFECTIVE = "1";
/** 失效 **/
public static final String TASK_NOTIFY_RECORD_STATUS_EXPIRE = "0";
/** 活动状态 **/
/** 有效 **/
public static final String DRAW_STATUS_EFFECTIVE = "1";
/** 失效 **/
public static final String DRAW_STATUS_EXPIRE = "0";
/** 奖项配置状态 **/
/** 有效 */
public static final String DRAW_CONFIG_STATUS_EFFECTIVE = "1";
/** 失效 **/
public static final String DRAW_CONFIG_STATUS_EXPIRE = "0";
/** 抽奖类型 **/
/** 积分抽奖 **/
public static final String DRAW_EXPE_INTEGRAL = "integral";
/** 次数抽奖 **/
public static final String DRAW_EXPE_TASK = "task";
/** 抽奖记录状态 **/
/** 没中奖 **/
public static final String DRAW_RECORD_RESULT_NONE = "0";
/** 中奖待发奖---发奖失败 **/
public static final String DRAW_RECORD_RESULT_PRIZE = "1";
/** 发奖成功 **/
public static final String DRAW_RECORD_RESULT_AWARDS = "2";
/** 奖品级别--空奖 1654**/
public static final String PRIZE_LEVEL_BLANK = "blank";
/** 奖品类型 ***/
public static final String PRIZE_TYPE_BLANK = "empty";
/**一账通**/
public static final String PRIZE_TYPE_VOCHER = "vocher";
/**实物**/
public static final String PRIZE_TYPE_MATERIALOBJECT = "materialObject";
/**积分**/
public static final String PRIZE_TYPE_INTEGRAL = "integral";
/**i购券**/
public static final String PRIZE_TYPE_IEMALL = "iemall";
/**公开码电子券**/
public static final String PRIZE_TYPE_PCOUPON = "pcoupon";
/**隐藏码电子券**/
public static final String PRIZE_TYPE_SCOUPON = "scoupon";
/**1656 积分平台虚拟电子券**/
public static final String PRIZE_TYPE_VCOUPON = "vcoupon";
/**服务奖品**/
public static final String PRIZE_TYPE_SERVICE = "service";
/**保险奖品**/
public static final String PRIZE_TYPE_INSURANCE = "insurance";
/**随机红包**/
public static final String PRIZE_TYPE_WELFARE = "welfare";
/**一账通现金红包 1654**/
public static final String PRIZE_TYPE_CASH = "cash";
/**发奖结果**/
public static final String AWARD_RESULT_SUCCESS="1";
public static final String AWARD_RESULT_FAIL="0";
/**活动类型-转盘抽奖**/
public static final String DRAW_TYPE_TURN_TABLE="turnTable";
/**奖品发放通知类型**/
public static final List<String> AWARD_TYPE=new ArrayList<String>();
static{
AWARD_TYPE.add("001");
AWARD_TYPE.add("002");
AWARD_TYPE.add("003");
AWARD_TYPE.add("004");
AWARD_TYPE.add("005");
AWARD_TYPE.add("006");
}
/**异步发列表**/
/**请求类型**/
public static final String TASK_TYPE_VALIDATE="1";
public static final String TASK_TYPE_SHARE="2";
public static final String TASK_TYPE_OTHER="3";
/**
* 1654
* 一账通支付
*/
public static final String TASK_TYPE_PAY="9";
/**一账通验证状态**/
public static final String TASK_NOTIFY_VSTATE_TRUE="1";
public static final String TASK_NOTIFY_VSTATE_FALSE="0";
/**发将限制规则**/
public static final String AWARD_TYPE_NONE="none";
/**单个活动限制**/
public static final String AWARD_TYPE_DISTINCTION="distinction";
/**不区分活动限制**/
public static final String AWARD_TYPE_NODISTINCTION="nodistinction";
/**用户等级**/
/**一般用户**/
public static final String USER_LEVEL_ORDINARY="1";
/**高价值客户**/
public static final String USER_LEVEL_SENIOR="2";
/**领奖方式**/
/**自动领取**/
public static final String AWARD_METHOD_AUTO="1";
/**手动领取**/
public static final String AWARD_METHOD_MANAL="0";
}

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

@ -14,6 +14,7 @@ import com.sinosoft.activity.service.IDrawTaskNotifyService;
import com.sinosoft.activity.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import me.chanjar.weixin.common.bean.WxOAuth2UserInfo;
import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken;
@ -61,6 +62,8 @@ public class DrawController {
@Autowired
private IActPageConfigUserinfoService iActPageConfigUserinfoService;
@Autowired
private IDrawTaskNotifyService taskNotifyService;
private WxOAuth2UserInfo getUserInfo(HttpServletRequest request, String code) throws Exception {
// if (!this.wxService.switchover(appid)) {
@ -240,6 +243,19 @@ public class DrawController {
}
return result;
}
/**
* 增加抽奖次数
* @param request
* @param drawCode
* @param taskType
* @return
*/
@ApiOperation("增加抽奖次数")
@ApiImplicitParams({
@ApiImplicitParam(name = "drawCode", value = "活动编码", required = true, dataType = "string", paramType = "path"),
@ApiImplicitParam(name = "taskType", value = "第三方活动编码", required = true, dataType = "string", paramType = "path")
})
@RequestMapping(value="/addDrawNum", method = RequestMethod.POST)
@ResponseBody
public Result addDrawNum(HttpServletRequest request, String drawCode, String taskType) {
@ -255,6 +271,13 @@ public class DrawController {
return result;
}
String openId = userInfo.getOpenid();
DrawTaskNotify drawTaskNotify = new DrawTaskNotify();
drawTaskNotify.setISSPECIALFLAG("0");
drawTaskNotify.setUSERID(openId);
drawTaskNotify.setTASKTYPE(taskType);
drawTaskNotify.setADDNUMBER(1);
drawTaskNotify.setDRAWCODE(drawCode);
taskNotifyService.addDrawNum(drawTaskNotify);
//赠送抽奖机会
// TaskNotifyRequestBody requestBody = new TaskNotifyRequestBody();
// requestBody.setTaskId("");

31
sino-act-web/src/main/resources/public/act/guide.html
View File

@ -14,7 +14,7 @@
<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"/>
<script src="/static/js/config.js"></script>
<script src="/js/config.js"></script>
<style type="text/css">
.button { /* 按钮美化 */
width: 200px; /* 宽度 */
@ -93,7 +93,9 @@
$("#desc").text(data.actPageConfigGuide.actDesc);
$("#btntext").val(data.actPageConfigGuide.btnText);
$("#btntext2").val(data.actPageConfigGuide.btnText2);
$("#btn2textshow").text(data.actPageConfigGuide.btnText2);
$("#flag").val(data.actType);
$(".contBox").text(data.actPageConfigGuide.btnLink2);
},
error: function (XMLHttpRequest, textStatus, errorThrown) {
console.log('网络异常', textStatus, errorThrown);
@ -112,10 +114,32 @@
<h1 class="title" id="title"></h1>
<h2 class="desc" id="desc"></h2>
<p class="btntext"><input class="button" id="btntext" type="button" onclick="jump()"/></p>
<p class="btntext2"><input class="button" id="btntext2" type="button"/></p>
<p class="btntext2"><input class="button" id="btntext2" type="button" onclick="btn2show()"/></p>
<input id="flag" type="hidden" value=""/>
</div>
<!--活动规则-->
<div class='popup rule btn2' 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 id="btn2textshow"></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>
@ -131,6 +155,9 @@
window.location.href='scratchcard.html?drawCode='+drawCode;
}
}
function btn2show(){
$('.btn2').show();
}
</script>
</html>

168
sino-activity/src/main/java/com/sinosoft/activity/domain/DrawDiscConfig.java Normal file
View File

@ -0,0 +1,168 @@
package com.sinosoft.activity.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 用户路由信息对象 draw_disc_config
*
* @author dy
* @date 2021-04-19
*/
public class DrawDiscConfig extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** */
@Excel(name = "")
private String DISCDRAWCONFIGID;
/** */
@Excel(name = "")
private String ISSPECIALFLAG;
/** */
@Excel(name = "")
private String VSTATE;
/** */
@Excel(name = "")
private String ULEVEL;
/** */
@Excel(name = "")
private String DRAWCODE;
/** */
@Excel(name = "")
private Long GETNUMBER;
/** */
@Excel(name = "")
private String SOURCE;
/** */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
private Date CREATETIMESTAMP;
/** */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
private Date LASTUPDATETIMESTAMP;
/** */
@Excel(name = "")
private String DESCRIPTION;
public void setDISCDRAWCONFIGID(String DISCDRAWCONFIGID)
{
this.DISCDRAWCONFIGID = DISCDRAWCONFIGID;
}
public String getDISCDRAWCONFIGID()
{
return DISCDRAWCONFIGID;
}
public void setISSPECIALFLAG(String ISSPECIALFLAG)
{
this.ISSPECIALFLAG = ISSPECIALFLAG;
}
public String getISSPECIALFLAG()
{
return ISSPECIALFLAG;
}
public void setVSTATE(String VSTATE)
{
this.VSTATE = VSTATE;
}
public String getVSTATE()
{
return VSTATE;
}
public void setULEVEL(String ULEVEL)
{
this.ULEVEL = ULEVEL;
}
public String getULEVEL()
{
return ULEVEL;
}
public void setDRAWCODE(String DRAWCODE)
{
this.DRAWCODE = DRAWCODE;
}
public String getDRAWCODE()
{
return DRAWCODE;
}
public void setGETNUMBER(Long GETNUMBER)
{
this.GETNUMBER = GETNUMBER;
}
public Long getGETNUMBER()
{
return GETNUMBER;
}
public void setSOURCE(String SOURCE)
{
this.SOURCE = SOURCE;
}
public String getSOURCE()
{
return SOURCE;
}
public void setCREATETIMESTAMP(Date CREATETIMESTAMP)
{
this.CREATETIMESTAMP = CREATETIMESTAMP;
}
public Date getCREATETIMESTAMP()
{
return CREATETIMESTAMP;
}
public void setLASTUPDATETIMESTAMP(Date LASTUPDATETIMESTAMP)
{
this.LASTUPDATETIMESTAMP = LASTUPDATETIMESTAMP;
}
public Date getLASTUPDATETIMESTAMP()
{
return LASTUPDATETIMESTAMP;
}
public void setDESCRIPTION(String DESCRIPTION)
{
this.DESCRIPTION = DESCRIPTION;
}
public String getDESCRIPTION()
{
return DESCRIPTION;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("DISCDRAWCONFIGID", getDISCDRAWCONFIGID())
.append("ISSPECIALFLAG", getISSPECIALFLAG())
.append("VSTATE", getVSTATE())
.append("ULEVEL", getULEVEL())
.append("DRAWCODE", getDRAWCODE())
.append("GETNUMBER", getGETNUMBER())
.append("SOURCE", getSOURCE())
.append("CREATETIMESTAMP", getCREATETIMESTAMP())
.append("LASTUPDATETIMESTAMP", getLASTUPDATETIMESTAMP())
.append("DESCRIPTION", getDESCRIPTION())
.toString();
}
}

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

@ -58,6 +58,18 @@ public class DrawRule extends BaseEntity
/** N次抽奖必中基数 */
private Long WILLDRAWAWARDNUMBER;
/**
* 活动描述
*/
private String DRAWDESCRIBE;
public String getDRAWDESCRIBE() {
return DRAWDESCRIBE;
}
public void setDRAWDESCRIBE(String DRAWDESCRIBE) {
this.DRAWDESCRIBE = DRAWDESCRIBE;
}
public String getDRAWCODE() {
return DRAWCODE;

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

@ -38,7 +38,7 @@ public class DrawTaskNotify extends BaseEntity
/** 赠送次数 */
@Excel(name = "赠送次数")
private Long ADDNUMBER;
private int ADDNUMBER;
/** 状态 */
@Excel(name = "状态")
@ -56,7 +56,7 @@ public class DrawTaskNotify extends BaseEntity
/** 可用次数 */
@Excel(name = "可用次数")
private Long AVAILABLENUMBER;
private int AVAILABLENUMBER;
/** 账务日期 */
private String CHECKINGDATE;
@ -132,12 +132,12 @@ public class DrawTaskNotify extends BaseEntity
{
return TYPE;
}
public void setADDNUMBER(Long ADDNUMBER)
public void setADDNUMBER(int ADDNUMBER)
{
this.ADDNUMBER = ADDNUMBER;
}
public Long getADDNUMBER()
public int getADDNUMBER()
{
return ADDNUMBER;
}
@ -168,12 +168,12 @@ public class DrawTaskNotify extends BaseEntity
{
return LASTUPDATETIMESTAMP;
}
public void setAVAILABLENUMBER(Long AVAILABLENUMBER)
public void setAVAILABLENUMBER(int AVAILABLENUMBER)
{
this.AVAILABLENUMBER = AVAILABLENUMBER;
}
public Long getAVAILABLENUMBER()
public int getAVAILABLENUMBER()
{
return AVAILABLENUMBER;
}

98
sino-activity/src/main/java/com/sinosoft/activity/domain/DrawWhitelist.java Normal file
View File

@ -0,0 +1,98 @@
package com.sinosoft.activity.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 白名单信息对象 draw_whitelist
*
* @author dy
* @date 2021-04-19
*/
public class DrawWhitelist extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** */
@Excel(name = "")
private String WHITELISTID;
/** */
@Excel(name = "")
private String PHONE;
/** */
@Excel(name = "")
private String FILENAME;
/** */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
private Date CREATETIMESTAMP;
/** */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "", width = 30, dateFormat = "yyyy-MM-dd")
private Date LASTUPDATETIMESTAMP;
public void setWHITELISTID(String WHITELISTID)
{
this.WHITELISTID = WHITELISTID;
}
public String getWHITELISTID()
{
return WHITELISTID;
}
public void setPHONE(String PHONE)
{
this.PHONE = PHONE;
}
public String getPHONE()
{
return PHONE;
}
public void setFILENAME(String FILENAME)
{
this.FILENAME = FILENAME;
}
public String getFILENAME()
{
return FILENAME;
}
public void setCREATETIMESTAMP(Date CREATETIMESTAMP)
{
this.CREATETIMESTAMP = CREATETIMESTAMP;
}
public Date getCREATETIMESTAMP()
{
return CREATETIMESTAMP;
}
public void setLASTUPDATETIMESTAMP(Date LASTUPDATETIMESTAMP)
{
this.LASTUPDATETIMESTAMP = LASTUPDATETIMESTAMP;
}
public Date getLASTUPDATETIMESTAMP()
{
return LASTUPDATETIMESTAMP;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("WHITELISTID", getWHITELISTID())
.append("PHONE", getPHONE())
.append("FILENAME", getFILENAME())
.append("CREATETIMESTAMP", getCREATETIMESTAMP())
.append("LASTUPDATETIMESTAMP", getLASTUPDATETIMESTAMP())
.toString();
}
}

61
sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawDiscConfigMapper.java Normal file
View File

@ -0,0 +1,61 @@
package com.sinosoft.activity.mapper;
import java.util.List;
import com.sinosoft.activity.domain.DrawDiscConfig;
/**
* 用户路由信息Mapper接口
*
* @author dy
* @date 2021-04-19
*/
public interface DrawDiscConfigMapper
{
/**
* 查询用户路由信息
*
* @param DISCDRAWCONFIGID 用户路由信息ID
* @return 用户路由信息
*/
public DrawDiscConfig selectDrawDiscConfigById(String DISCDRAWCONFIGID);
/**
* 查询用户路由信息列表
*
* @param drawDiscConfig 用户路由信息
* @return 用户路由信息集合
*/
public List<DrawDiscConfig> selectDrawDiscConfigList(DrawDiscConfig drawDiscConfig);
/**
* 新增用户路由信息
*
* @param drawDiscConfig 用户路由信息
* @return 结果
*/
public int insertDrawDiscConfig(DrawDiscConfig drawDiscConfig);
/**
* 修改用户路由信息
*
* @param drawDiscConfig 用户路由信息
* @return 结果
*/
public int updateDrawDiscConfig(DrawDiscConfig drawDiscConfig);
/**
* 删除用户路由信息
*
* @param DISCDRAWCONFIGID 用户路由信息ID
* @return 结果
*/
public int deleteDrawDiscConfigById(String DISCDRAWCONFIGID);
/**
* 批量删除用户路由信息
*
* @param DISCDRAWCONFIGIDs 需要删除的数据ID
* @return 结果
*/
public int deleteDrawDiscConfigByIds(String[] DISCDRAWCONFIGIDs);
}

9
sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawTaskNotifyMapper.java
View File

@ -1,6 +1,8 @@
package com.sinosoft.activity.mapper;
import java.util.List;
import java.util.Map;
import com.sinosoft.activity.domain.DrawTaskNotify;
/**
@ -60,4 +62,11 @@ public interface DrawTaskNotifyMapper
* @return 结果
*/
public int deleteDrawTaskNotifyByIds(String[] USERIDs);
/**
* 查询基础代码表中的数据
* @param drawNumberLimit
* @return
*/
Map<String, String> findAllCodeAndName(String drawNumberLimit);
}

61
sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawWhitelistMapper.java Normal file
View File

@ -0,0 +1,61 @@
package com.sinosoft.activity.mapper;
import java.util.List;
import com.sinosoft.activity.domain.DrawWhitelist;
/**
* 白名单信息Mapper接口
*
* @author dy
* @date 2021-04-19
*/
public interface DrawWhitelistMapper
{
/**
* 查询白名单信息
*
* @param WHITELISTID 白名单信息ID
* @return 白名单信息
*/
public DrawWhitelist selectDrawWhitelistById(String WHITELISTID);
/**
* 查询白名单信息列表
*
* @param drawWhitelist 白名单信息
* @return 白名单信息集合
*/
public List<DrawWhitelist> selectDrawWhitelistList(DrawWhitelist drawWhitelist);
/**
* 新增白名单信息
*
* @param drawWhitelist 白名单信息
* @return 结果
*/
public int insertDrawWhitelist(DrawWhitelist drawWhitelist);
/**
* 修改白名单信息
*
* @param drawWhitelist 白名单信息
* @return 结果
*/
public int updateDrawWhitelist(DrawWhitelist drawWhitelist);
/**
* 删除白名单信息
*
* @param WHITELISTID 白名单信息ID
* @return 结果
*/
public int deleteDrawWhitelistById(String WHITELISTID);
/**
* 批量删除白名单信息
*
* @param WHITELISTIDs 需要删除的数据ID
* @return 结果
*/
public int deleteDrawWhitelistByIds(String[] WHITELISTIDs);
}

61
sino-activity/src/main/java/com/sinosoft/activity/service/IDrawDiscConfigService.java Normal file
View File

@ -0,0 +1,61 @@
package com.sinosoft.activity.service;
import java.util.List;
import com.sinosoft.activity.domain.DrawDiscConfig;
/**
* 用户路由信息Service接口
*
* @author dy
* @date 2021-04-19
*/
public interface IDrawDiscConfigService
{
/**
* 查询用户路由信息
*
* @param DISCDRAWCONFIGID 用户路由信息ID
* @return 用户路由信息
*/
public DrawDiscConfig selectDrawDiscConfigById(String DISCDRAWCONFIGID);
/**
* 查询用户路由信息列表
*
* @param drawDiscConfig 用户路由信息
* @return 用户路由信息集合
*/
public List<DrawDiscConfig> selectDrawDiscConfigList(DrawDiscConfig drawDiscConfig);
/**
* 新增用户路由信息
*
* @param drawDiscConfig 用户路由信息
* @return 结果
*/
public int insertDrawDiscConfig(DrawDiscConfig drawDiscConfig);
/**
* 修改用户路由信息
*
* @param drawDiscConfig 用户路由信息
* @return 结果
*/
public int updateDrawDiscConfig(DrawDiscConfig drawDiscConfig);
/**
* 批量删除用户路由信息
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteDrawDiscConfigByIds(String ids);
/**
* 删除用户路由信息信息
*
* @param DISCDRAWCONFIGID 用户路由信息ID
* @return 结果
*/
public int deleteDrawDiscConfigById(String DISCDRAWCONFIGID);
}

8
sino-activity/src/main/java/com/sinosoft/activity/service/IDrawTaskNotifyService.java
View File

@ -1,6 +1,8 @@
package com.sinosoft.activity.service;
import java.util.List;
import java.util.Map;
import com.sinosoft.activity.domain.DrawTaskNotify;
/**
@ -59,4 +61,10 @@ public interface IDrawTaskNotifyService
* @return 结果
*/
public int deleteDrawTaskNotifyById(String USERID);
/**
* 增加抽奖次数
* @param drawTaskNotify
*/
Map<String,Object> addDrawNum(DrawTaskNotify drawTaskNotify);
}

61
sino-activity/src/main/java/com/sinosoft/activity/service/IDrawWhitelistService.java Normal file
View File

@ -0,0 +1,61 @@
package com.sinosoft.activity.service;
import java.util.List;
import com.sinosoft.activity.domain.DrawWhitelist;
/**
* 白名单信息Service接口
*
* @author dy
* @date 2021-04-19
*/
public interface IDrawWhitelistService
{
/**
* 查询白名单信息
*
* @param WHITELISTID 白名单信息ID
* @return 白名单信息
*/
public DrawWhitelist selectDrawWhitelistById(String WHITELISTID);
/**
* 查询白名单信息列表
*
* @param drawWhitelist 白名单信息
* @return 白名单信息集合
*/
public List<DrawWhitelist> selectDrawWhitelistList(DrawWhitelist drawWhitelist);
/**
* 新增白名单信息
*
* @param drawWhitelist 白名单信息
* @return 结果
*/
public int insertDrawWhitelist(DrawWhitelist drawWhitelist);
/**
* 修改白名单信息
*
* @param drawWhitelist 白名单信息
* @return 结果
*/
public int updateDrawWhitelist(DrawWhitelist drawWhitelist);
/**
* 批量删除白名单信息
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteDrawWhitelistByIds(String ids);
/**
* 删除白名单信息信息
*
* @param WHITELISTID 白名单信息ID
* @return 结果
*/
public int deleteDrawWhitelistById(String WHITELISTID);
}

94
sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawDiscConfigServiceImpl.java Normal file
View File

@ -0,0 +1,94 @@
package com.sinosoft.activity.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.sinosoft.activity.mapper.DrawDiscConfigMapper;
import com.sinosoft.activity.domain.DrawDiscConfig;
import com.sinosoft.activity.service.IDrawDiscConfigService;
import com.ruoyi.common.core.text.Convert;
/**
* 用户路由信息Service业务层处理
*
* @author dy
* @date 2021-04-19
*/
@Service
public class DrawDiscConfigServiceImpl implements IDrawDiscConfigService
{
@Autowired
private DrawDiscConfigMapper drawDiscConfigMapper;
/**
* 查询用户路由信息
*
* @param DISCDRAWCONFIGID 用户路由信息ID
* @return 用户路由信息
*/
@Override
public DrawDiscConfig selectDrawDiscConfigById(String DISCDRAWCONFIGID)
{
return drawDiscConfigMapper.selectDrawDiscConfigById(DISCDRAWCONFIGID);
}
/**
* 查询用户路由信息列表
*
* @param drawDiscConfig 用户路由信息
* @return 用户路由信息
*/
@Override
public List<DrawDiscConfig> selectDrawDiscConfigList(DrawDiscConfig drawDiscConfig)
{
return drawDiscConfigMapper.selectDrawDiscConfigList(drawDiscConfig);
}
/**
* 新增用户路由信息
*
* @param drawDiscConfig 用户路由信息
* @return 结果
*/
@Override
public int insertDrawDiscConfig(DrawDiscConfig drawDiscConfig)
{
return drawDiscConfigMapper.insertDrawDiscConfig(drawDiscConfig);
}
/**
* 修改用户路由信息
*
* @param drawDiscConfig 用户路由信息
* @return 结果
*/
@Override
public int updateDrawDiscConfig(DrawDiscConfig drawDiscConfig)
{
return drawDiscConfigMapper.updateDrawDiscConfig(drawDiscConfig);
}
/**
* 删除用户路由信息对象
*
* @param ids 需要删除的数据ID
* @return 结果
*/
@Override
public int deleteDrawDiscConfigByIds(String ids)
{
return drawDiscConfigMapper.deleteDrawDiscConfigByIds(Convert.toStrArray(ids));
}
/**
* 删除用户路由信息信息
*
* @param DISCDRAWCONFIGID 用户路由信息ID
* @return 结果
*/
@Override
public int deleteDrawDiscConfigById(String DISCDRAWCONFIGID)
{
return drawDiscConfigMapper.deleteDrawDiscConfigById(DISCDRAWCONFIGID);
}
}

264
sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawTaskNotifyServiceImpl.java
View File

@ -1,16 +1,22 @@
package com.sinosoft.activity.service.impl;
import java.util.Date;
import java.util.List;
import com.sinosoft.activity.domain.DrawTaskConsume;
import com.sinosoft.activity.mapper.DrawTaskConsumeMapper;
import com.ruoyi.common.constant.ActConstants;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.StringUtils;
import com.sinosoft.activity.domain.*;
import com.sinosoft.activity.mapper.*;
import com.sinosoft.activity.service.IDrawTaskNotifyService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.poi.ss.usermodel.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.sinosoft.activity.mapper.DrawTaskNotifyMapper;
import com.sinosoft.activity.domain.DrawTaskNotify;
import com.sinosoft.activity.service.IDrawTaskNotifyService;
import com.ruoyi.common.core.text.Convert;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 活动次数记录信息Service业务层处理
@ -25,6 +31,12 @@ public class DrawTaskNotifyServiceImpl implements IDrawTaskNotifyService
private DrawTaskNotifyMapper drawTaskNotifyMapper;
@Autowired
private DrawTaskConsumeMapper drawTaskConsumeMapper;
@Autowired
private DrawInfoMapper drawInfoMapper;
@Autowired
private DrawWhitelistMapper drawWhitelistMapper;
@Autowired
private DrawDiscConfigMapper drawDiscConfigMapper;
/**
* 查询活动次数记录信息
@ -132,4 +144,238 @@ public class DrawTaskNotifyServiceImpl implements IDrawTaskNotifyService
{
return drawTaskNotifyMapper.deleteDrawTaskNotifyById(USERID);
}
/**
* 1.查询活动状态
* 2.查询记录表是否重复
*
*
* @param drawTaskNotify
*/
@Override
public Map<String, Object> addDrawNum(DrawTaskNotify drawTaskNotify) {
HashMap<String, Object> response = new HashMap<>();
long start = System.currentTimeMillis();
long end = 0;
long proct = 0;
String exception = null;
try {
//请求类型
String taskType = drawTaskNotify.getTASKTYPE();
int number = 0;
String currentDateString = new SimpleDateFormat("yyyyMMdd").format(new Date());
String taskId = drawTaskNotify.getTASKID();
// String getNumber = requestBody.getGetNumber();
String userId = drawTaskNotify.getUSERID();
// String isLimited = requestBody.getIsLimited();
String isSpecialFlag = null;
String drawCode = drawTaskNotify.getDRAWCODE();//活动编码
String source = null;
String uLevel = null;
String vState = drawTaskNotify.getVSTATE();
// 查询活动
DrawInfo drawInfo = new DrawInfo();
drawInfo.setDRAWCODE(drawCode);
drawInfo.setSTATUS("1");
List<DrawInfo> drawInfos = drawInfoMapper.selectDrawInfoList(drawInfo);
if (CollectionUtils.isNotEmpty(drawInfos)) {
// response = response(request, WebServiceResult.EXCEPTION_000001, WebServiceResult.getReturnMessage(WebServiceResult.EXCEPTION_000001, "drawCode参数错误"));
response.put("msg", "drawCode参数错误");
response.put("code", "-1");
} else {
// 完成一账通身份认证增加次数
if (taskType.equals(ActConstants.TASK_TYPE_VALIDATE) || taskType.equals(ActConstants.TASK_TYPE_SHARE)) {
if (taskType.equals(ActConstants.TASK_TYPE_VALIDATE)) {
// 一账通只能认证一次，查询是否已经做过认证送次数
DrawTaskNotify QueryRule = new DrawTaskNotify();
QueryRule.setUSERID(drawTaskNotify.getUSERID());
QueryRule.setTASKTYPE(drawTaskNotify.getTASKTYPE());
List<DrawTaskNotify> drawTaskNotifies = drawTaskNotifyMapper.selectDrawTaskNotifyList(QueryRule);
// 已经做过身份认证，直接返回，不赠送次数
if (CollectionUtils.isNotEmpty(drawTaskNotifies)) {
// response = response(request, WebServiceResult.EXCEPTION_000006, WebServiceResult.getReturnMessage(WebServiceResult.EXCEPTION_000006, "身份认证送抽奖机会已经完成"));
response.put("msg", "身份认证送抽奖机会已经完成");
response.put("code", "-1");
return response;
}
}
// 发放次数
if ("isLimited".equals("1")) {
//查询赠送限制次数
Map<String, String> drawNumberMap = drawTaskNotifyMapper.findAllCodeAndName("drawNumberLimit");
int limitNumber = Integer.parseInt(drawNumberMap.get(taskId));
// 查询今天发放的次数
DrawTaskNotify QueryRule = new DrawTaskNotify();
QueryRule.setDRAWCODE(drawCode);
QueryRule.setTASKID(taskId);
QueryRule.setUSERID(userId);
QueryRule.setCHECKINGDATE(currentDateString);
List<DrawTaskNotify> drawTaskNotifies = drawTaskNotifyMapper.selectDrawTaskNotifyList(QueryRule);
if (CollectionUtils.isNotEmpty(drawTaskNotifies)) {
//今天进行过增加次数
Integer totalNumber = 0;//总次数
for (DrawTaskNotify drawTaskNotify1 : drawTaskNotifies) {
totalNumber += drawTaskNotify1.getADDNUMBER();
}
// 查看是否到达上限
int surplusNum = limitNumber - totalNumber;
if (drawTaskNotify.getADDNUMBER() > surplusNum) {
number = surplusNum > 0 ? surplusNum : 0;
}
} else {
//今天没赠送次数
number = drawTaskNotify.getADDNUMBER() > limitNumber ? limitNumber : 0;
}
}
} else if (taskType.equals(ActConstants.TASK_TYPE_OTHER)) {
// 查询是不是在白名单
DrawWhitelist drawWhitelist = new DrawWhitelist();
drawWhitelist.setPHONE(drawTaskNotify.getPHONE());
List<DrawWhitelist> drawWhitelists = drawWhitelistMapper.selectDrawWhitelistList(drawWhitelist);
DrawDiscConfig drawDiscConfig = new DrawDiscConfig();
if (CollectionUtils.isEmpty(drawWhitelists)) {
// 不在白名单
isSpecialFlag = "0";
drawDiscConfig.setISSPECIALFLAG( isSpecialFlag);
// 区分来源
source = drawTaskNotify.getSOURCE();
drawDiscConfig.setSOURCE(source);
// 不区分是否验证身份
drawDiscConfig.setVSTATE(vState);
// 广发不区分区分等级，其他渠道区分等级
Map<String, String> noneLevelMap = drawTaskNotifyMapper.findAllCodeAndName("NONELEVEL");
if (noneLevelMap.containsKey(drawTaskNotify.getSOURCE())) {
uLevel = "none";
drawDiscConfig.setULEVEL(uLevel);
} else {
if (drawTaskNotify.getVSTATE().equals("1")) {
if (StringUtils.isEmpty(drawTaskNotify.getULEVEL())) {
// response = response(request, WebServiceResult.EXCEPTION_000001, WebServiceResult.getReturnMessage(WebServiceResult.EXCEPTION_000001, "uLevel参数为空"));
response.put("msg","uLevel参数为空");
response.put("code","-1");
return response;
}
uLevel = drawTaskNotify.getULEVEL();
Map<String, String> userLevelPointMap = drawTaskNotifyMapper.findAllCodeAndName("userLevel");
if (!userLevelPointMap.containsKey("point")) {
// response = response(request, WebServiceResult.EXCEPTION, WebServiceResult.getReturnMessage(WebServiceResult.EXCEPTION, "用户等级配置错误"));
response.put("msg","用户等级配置错误");
response.put("code","-1");
return response;
}
if (new BigDecimal(uLevel).compareTo(new BigDecimal(userLevelPointMap.get("point"))) == -1) {
// 用户等级小于界限，判定为一般用户
drawDiscConfig.setULEVEL(ActConstants.USER_LEVEL_ORDINARY);
drawTaskNotify.setULEVEL(ActConstants.USER_LEVEL_ORDINARY);
} else {
// 高价值客户
drawDiscConfig.setULEVEL(ActConstants.USER_LEVEL_SENIOR);
drawTaskNotify.setULEVEL(ActConstants.USER_LEVEL_SENIOR);
}
} else {
uLevel = "none";
drawDiscConfig.setULEVEL(uLevel);
}
}
} else {
// 在白名单
isSpecialFlag = "1";
// 不区分来源
source = "none";
drawDiscConfig.setSOURCE(source);
// 区分是否验证身份
drawDiscConfig.setVSTATE(vState);
// 不区分等级
uLevel = "none";
drawDiscConfig.setULEVEL(uLevel);
}
drawDiscConfig.setISSPECIALFLAG(isSpecialFlag);
List<DrawDiscConfig> drawDiscConfigs = drawDiscConfigMapper.selectDrawDiscConfigList(drawDiscConfig);
if (CollectionUtils.isEmpty(drawDiscConfigs)) {
// response = response(request, WebServiceResult.EXCEPTION_000006, WebServiceResult.getReturnMessage(WebServiceResult.EXCEPTION_000006, "配置错误"));
response.put("msg","配置错误");
response.put("code","-1");
return response;
}
// 一天只能调用一次设定number
// 查询今天是否做过
DrawTaskNotify QueryRule = new DrawTaskNotify();
QueryRule.setTASKTYPE(ActConstants.TASK_TYPE_OTHER);
QueryRule.setUSERID(userId);
QueryRule.setCHECKINGDATE(currentDateString);
List<DrawTaskNotify> drawTaskNotifies = drawTaskNotifyMapper.selectDrawTaskNotifyList(QueryRule);
if (CollectionUtils.isEmpty(drawTaskNotifies)) {
number = drawDiscConfig.getGETNUMBER().intValue();
} else {
number = 0;
}
drawCode = drawDiscConfig.getDRAWCODE();
}
}
if (number > 0) {
DrawTaskNotify gtTaskNotify = new DrawTaskNotify();
gtTaskNotify.setPHONE(drawTaskNotify.getPHONE());
gtTaskNotify.setSOURCE(source);
gtTaskNotify.setTASKTYPE(drawTaskNotify.getTASKTYPE());
gtTaskNotify.setTYPE(ActConstants.DRAW_TYPE_TURN_TABLE);
gtTaskNotify.setULEVEL(uLevel);
gtTaskNotify.setISSPECIALFLAG(isSpecialFlag);
gtTaskNotify.setVSTATE(vState);
gtTaskNotify.setCreateTime(new Date());
gtTaskNotify.setDRAWCODE(drawCode);
gtTaskNotify.setADDNUMBER(number);
gtTaskNotify.setLASTUPDATETIMESTAMP(new Date());
gtTaskNotify.setSTATE(ActConstants.TASK_NOTIFY_RECORD_STATUS_EFFECTIVE);
gtTaskNotify.setAVAILABLENUMBER(number);
gtTaskNotify.setTASKID(drawTaskNotify.getTASKID());
gtTaskNotify.setUSERID(drawTaskNotify.getUSERID());
gtTaskNotify.setCHECKINGDATE(currentDateString);
if (taskType.equals(ActConstants.TASK_TYPE_OTHER)) {
gtTaskNotify.setREQUESTFLAG("AAAA");
} else {
// String seq = new SimpleDateFormat("yyyyMMdd").format(new Date()) + sequenceService.getGtReqFlagSeq();
// gtTaskNotify.setREQUESTFLAG(seq);
}
drawTaskNotifyMapper.insertDrawTaskNotify(gtTaskNotify);
}
// responseHeader.setResultCode(WebServiceResult.SUCCESS);
// responseHeader.setResultInfo(WebServiceResult.getReturnMessage(WebServiceResult.SUCCESS));
// responseHeader.setTranDate(DateUtil.nowDateToString(Constant.DATE_FORMAT3));
// responseHeader.setTranTime(DateUtil.nowDateToString(Constant.DATE_FORMAT4));
// responseHeader.setSerialNo(requestHeader.getSerialNo());
// response.setHeader(responseHeader);
// 请求体
// responseBody.setGetNumber(String.valueOf(number));
// responseBody.setTaskId(taskId);
// responseBody.setUserId(userId);
// responseBody.setDrawCode(drawCode);
// responseBody.setTaskType(requestBody.getTaskType());
// response.setResponseBody(responseBody);
end = System.currentTimeMillis();
proct=end-start;
// logger.info("【任务完成通知接口请求报文】" + jsonBinder.toJson(request) + "【任务完成通知接口响应报文】" + jsonBinder.toJson(response) + "【处理时间】" + proct);
return response;
} catch (NumberFormatException e) {
e.printStackTrace();
// exception = CommonUtil.stackTrace2String(e);
// response = response(request, WebServiceResult.EXCEPTION_000006, WebServiceResult.getReturnMessage(WebServiceResult.EXCEPTION_000006, "参数格式错误"));
// logger.error("增加抽奖次数接口异常，异常原因", e);
return response;
} finally {
// InPortalTransmessage message = new InPortalTransmessage();
// message.setException(exception);
// message.setTransCode(transCode);
// message.setTransRefGuid(request.getHeader().getSerialNo());
// message.setRequestTime(new Date());
// message.setResponseTime(new Date());
// message.setRequestMessage(jsonBinder.toJson(request));
// message.setResponseMessage(jsonBinder.toJson(response));
// message.setProct(proct);
// transRecordService.offer(message);
}
}
}

94
sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawWhitelistServiceImpl.java Normal file
View File

@ -0,0 +1,94 @@
package com.sinosoft.activity.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.sinosoft.activity.mapper.DrawWhitelistMapper;
import com.sinosoft.activity.domain.DrawWhitelist;
import com.sinosoft.activity.service.IDrawWhitelistService;
import com.ruoyi.common.core.text.Convert;
/**
* 白名单信息Service业务层处理
*
* @author dy
* @date 2021-04-19
*/
@Service
public class DrawWhitelistServiceImpl implements IDrawWhitelistService
{
@Autowired
private DrawWhitelistMapper drawWhitelistMapper;
/**
* 查询白名单信息
*
* @param WHITELISTID 白名单信息ID
* @return 白名单信息
*/
@Override
public DrawWhitelist selectDrawWhitelistById(String WHITELISTID)
{
return drawWhitelistMapper.selectDrawWhitelistById(WHITELISTID);
}
/**
* 查询白名单信息列表
*
* @param drawWhitelist 白名单信息
* @return 白名单信息
*/
@Override
public List<DrawWhitelist> selectDrawWhitelistList(DrawWhitelist drawWhitelist)
{
return drawWhitelistMapper.selectDrawWhitelistList(drawWhitelist);
}
/**
* 新增白名单信息
*
* @param drawWhitelist 白名单信息
* @return 结果
*/
@Override
public int insertDrawWhitelist(DrawWhitelist drawWhitelist)
{
return drawWhitelistMapper.insertDrawWhitelist(drawWhitelist);
}
/**
* 修改白名单信息
*
* @param drawWhitelist 白名单信息
* @return 结果
*/
@Override
public int updateDrawWhitelist(DrawWhitelist drawWhitelist)
{
return drawWhitelistMapper.updateDrawWhitelist(drawWhitelist);
}
/**
* 删除白名单信息对象
*
* @param ids 需要删除的数据ID
* @return 结果
*/
@Override
public int deleteDrawWhitelistByIds(String ids)
{
return drawWhitelistMapper.deleteDrawWhitelistByIds(Convert.toStrArray(ids));
}
/**
* 删除白名单信息信息
*
* @param WHITELISTID 白名单信息ID
* @return 结果
*/
@Override
public int deleteDrawWhitelistById(String WHITELISTID)
{
return drawWhitelistMapper.deleteDrawWhitelistById(WHITELISTID);
}
}

100
sino-activity/src/main/resources/mapper/activity/DrawDiscConfigMapper.xml Normal file
View File

@ -0,0 +1,100 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sinosoft.activity.mapper.DrawDiscConfigMapper">
<resultMap type="DrawDiscConfig" id="DrawDiscConfigResult">
<result property="DISCDRAWCONFIGID" column="DISCDRAWCONFIGID" />
<result property="ISSPECIALFLAG" column="ISSPECIALFLAG" />
<result property="VSTATE" column="VSTATE" />
<result property="ULEVEL" column="ULEVEL" />
<result property="DRAWCODE" column="DRAWCODE" />
<result property="GETNUMBER" column="GETNUMBER" />
<result property="SOURCE" column="SOURCE" />
<result property="CREATETIMESTAMP" column="CREATETIMESTAMP" />
<result property="LASTUPDATETIMESTAMP" column="LASTUPDATETIMESTAMP" />
<result property="DESCRIPTION" column="DESCRIPTION" />
</resultMap>
<sql id="selectDrawDiscConfigVo">
select DISCDRAWCONFIGID, ISSPECIALFLAG, VSTATE, ULEVEL, DRAWCODE, GETNUMBER, SOURCE, CREATETIMESTAMP, LASTUPDATETIMESTAMP, DESCRIPTION from draw_disc_config
</sql>
<select id="selectDrawDiscConfigList" parameterType="DrawDiscConfig" resultMap="DrawDiscConfigResult">
<include refid="selectDrawDiscConfigVo"/>
<where>
<if test="DISCDRAWCONFIGID != null and DISCDRAWCONFIGID != ''"> and DISCDRAWCONFIGID = #{DISCDRAWCONFIGID}</if>
<if test="ISSPECIALFLAG != null and ISSPECIALFLAG != ''"> and ISSPECIALFLAG = #{ISSPECIALFLAG}</if>
<if test="VSTATE != null and VSTATE != ''"> and VSTATE = #{VSTATE}</if>
<if test="ULEVEL != null and ULEVEL != ''"> and ULEVEL = #{ULEVEL}</if>
<if test="DRAWCODE != null and DRAWCODE != ''"> and DRAWCODE = #{DRAWCODE}</if>
<if test="GETNUMBER != null "> and GETNUMBER = #{GETNUMBER}</if>
<if test="SOURCE != null and SOURCE != ''"> and SOURCE = #{SOURCE}</if>
<if test="CREATETIMESTAMP != null "> and CREATETIMESTAMP = #{CREATETIMESTAMP}</if>
<if test="LASTUPDATETIMESTAMP != null "> and LASTUPDATETIMESTAMP = #{LASTUPDATETIMESTAMP}</if>
<if test="DESCRIPTION != null and DESCRIPTION != ''"> and DESCRIPTION = #{DESCRIPTION}</if>
</where>
</select>
<select id="selectDrawDiscConfigById" parameterType="String" resultMap="DrawDiscConfigResult">
<include refid="selectDrawDiscConfigVo"/>
where DISCDRAWCONFIGID = #{DISCDRAWCONFIGID}
</select>
<insert id="insertDrawDiscConfig" parameterType="DrawDiscConfig">
insert into draw_disc_config
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="DISCDRAWCONFIGID != null and DISCDRAWCONFIGID != ''">DISCDRAWCONFIGID,</if>
<if test="ISSPECIALFLAG != null">ISSPECIALFLAG,</if>
<if test="VSTATE != null">VSTATE,</if>
<if test="ULEVEL != null">ULEVEL,</if>
<if test="DRAWCODE != null">DRAWCODE,</if>
<if test="GETNUMBER != null">GETNUMBER,</if>
<if test="SOURCE != null">SOURCE,</if>
<if test="CREATETIMESTAMP != null">CREATETIMESTAMP,</if>
<if test="LASTUPDATETIMESTAMP != null">LASTUPDATETIMESTAMP,</if>
<if test="DESCRIPTION != null">DESCRIPTION,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="DISCDRAWCONFIGID != null and DISCDRAWCONFIGID != ''">#{DISCDRAWCONFIGID},</if>
<if test="ISSPECIALFLAG != null">#{ISSPECIALFLAG},</if>
<if test="VSTATE != null">#{VSTATE},</if>
<if test="ULEVEL != null">#{ULEVEL},</if>
<if test="DRAWCODE != null">#{DRAWCODE},</if>
<if test="GETNUMBER != null">#{GETNUMBER},</if>
<if test="SOURCE != null">#{SOURCE},</if>
<if test="CREATETIMESTAMP != null">#{CREATETIMESTAMP},</if>
<if test="LASTUPDATETIMESTAMP != null">#{LASTUPDATETIMESTAMP},</if>
<if test="DESCRIPTION != null">#{DESCRIPTION},</if>
</trim>
</insert>
<update id="updateDrawDiscConfig" parameterType="DrawDiscConfig">
update draw_disc_config
<trim prefix="SET" suffixOverrides=",">
<if test="ISSPECIALFLAG != null">ISSPECIALFLAG = #{ISSPECIALFLAG},</if>
<if test="VSTATE != null">VSTATE = #{VSTATE},</if>
<if test="ULEVEL != null">ULEVEL = #{ULEVEL},</if>
<if test="DRAWCODE != null">DRAWCODE = #{DRAWCODE},</if>
<if test="GETNUMBER != null">GETNUMBER = #{GETNUMBER},</if>
<if test="SOURCE != null">SOURCE = #{SOURCE},</if>
<if test="CREATETIMESTAMP != null">CREATETIMESTAMP = #{CREATETIMESTAMP},</if>
<if test="LASTUPDATETIMESTAMP != null">LASTUPDATETIMESTAMP = #{LASTUPDATETIMESTAMP},</if>
<if test="DESCRIPTION != null">DESCRIPTION = #{DESCRIPTION},</if>
</trim>
where DISCDRAWCONFIGID = #{DISCDRAWCONFIGID}
</update>
<delete id="deleteDrawDiscConfigById" parameterType="String">
delete from draw_disc_config where DISCDRAWCONFIGID = #{DISCDRAWCONFIGID}
</delete>
<delete id="deleteDrawDiscConfigByIds" parameterType="String">
delete from draw_disc_config where DISCDRAWCONFIGID in
<foreach item="DISCDRAWCONFIGID" collection="array" open="(" separator="," close=")">
#{DISCDRAWCONFIGID}
</foreach>
</delete>
</mapper>

7
sino-activity/src/main/resources/mapper/activity/DrawRuleMapper.xml
View File

@ -18,10 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="CREATETIMESTAMP" column="CREATETIMESTAMP" />
<result property="LASTUPDATETIMESTAMP" column="LASTUPDATETIMESTAMP" />
<result property="WILLDRAWAWARDNUMBER" column="WILLDRAWAWARDNUMBER" />
<result property="DRAWDESCRIBE" column="DRAWDESCRIBE" />
</resultMap>
<sql id="selectDrawRuleVo">
select DRAWRULEID, DRAWCODE, FIRSTFLAG, FIRSTAWARDPRIZE, DAILYFLAG, DAILYSTARTTIME, DAILYENDTIME, DAILYNUMBER, WILLDRAWFLAG, WILLDRAWAWARDPRIZE, CREATETIMESTAMP, LASTUPDATETIMESTAMP, WILLDRAWAWARDNUMBER from draw_rule
select DRAWRULEID, DRAWCODE, FIRSTFLAG, FIRSTAWARDPRIZE, DAILYFLAG, DAILYSTARTTIME, DAILYENDTIME, DAILYNUMBER, WILLDRAWFLAG, WILLDRAWAWARDPRIZE, CREATETIMESTAMP, LASTUPDATETIMESTAMP, WILLDRAWAWARDNUMBER,DRAWDESCRIBE from draw_rule
</sql>
<select id="selectDrawRuleList" parameterType="DrawRule" resultMap="DrawRuleResult">
@ -39,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="CREATETIMESTAMP != null "> and CREATETIMESTAMP = #{CREATETIMESTAMP}</if>
<if test="LASTUPDATETIMESTAMP != null "> and LASTUPDATETIMESTAMP = #{LASTUPDATETIMESTAMP}</if>
<if test="WILLDRAWAWARDNUMBER != null "> and WILLDRAWAWARDNUMBER = #{WILLDRAWAWARDNUMBER}</if>
<if test="DRAWDESCRIBE != null "> and DRAWDESCRIBE = #{DRAWDESCRIBE}</if>
</where>
</select>
@ -68,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="CREATETIMESTAMP != null">CREATETIMESTAMP,</if>
<if test="LASTUPDATETIMESTAMP != null">LASTUPDATETIMESTAMP,</if>
<if test="WILLDRAWAWARDNUMBER != null">WILLDRAWAWARDNUMBER,</if>
<if test="DRAWDESCRIBE != null">DRAWDESCRIBE,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="DRAWRULEID != null">#{DRAWRULEID},</if>
@ -83,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="CREATETIMESTAMP != null">#{CREATETIMESTAMP},</if>
<if test="LASTUPDATETIMESTAMP != null">#{LASTUPDATETIMESTAMP},</if>
<if test="WILLDRAWAWARDNUMBER != null">#{WILLDRAWAWARDNUMBER},</if>
<if test="DRAWDESCRIBE != null">#{DRAWDESCRIBE},</if>
</trim>
</insert>
@ -100,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="CREATETIMESTAMP != null">CREATETIMESTAMP = #{CREATETIMESTAMP},</if>
<if test="LASTUPDATETIMESTAMP != null">LASTUPDATETIMESTAMP = #{LASTUPDATETIMESTAMP},</if>
<if test="WILLDRAWAWARDNUMBER != null">WILLDRAWAWARDNUMBER = #{WILLDRAWAWARDNUMBER},</if>
<if test="DRAWDESCRIBE != null">DRAWDESCRIBE = #{DRAWDESCRIBE},</if>
</trim>
where DRAWCODE = #{DRAWCODE}
</update>

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

@ -144,4 +144,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
<select id="findAllCodeAndName" parameterType="string">
select d.CODECODE,d.CODECNAME from GT_CODE d where d.CODETYPE= #{drawNumberLimit}
</select>
</mapper>

75
sino-activity/src/main/resources/mapper/activity/DrawWhitelistMapper.xml Normal file
View File

@ -0,0 +1,75 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sinosoft.activity.mapper.DrawWhitelistMapper">
<resultMap type="DrawWhitelist" id="DrawWhitelistResult">
<result property="WHITELISTID" column="WHITELISTID" />
<result property="PHONE" column="PHONE" />
<result property="FILENAME" column="FILENAME" />
<result property="CREATETIMESTAMP" column="CREATETIMESTAMP" />
<result property="LASTUPDATETIMESTAMP" column="LASTUPDATETIMESTAMP" />
</resultMap>
<sql id="selectDrawWhitelistVo">
select WHITELISTID, PHONE, FILENAME, CREATETIMESTAMP, LASTUPDATETIMESTAMP from draw_whitelist
</sql>
<select id="selectDrawWhitelistList" parameterType="DrawWhitelist" resultMap="DrawWhitelistResult">
<include refid="selectDrawWhitelistVo"/>
<where>
<if test="WHITELISTID != null and WHITELISTID != ''"> and WHITELISTID = #{WHITELISTID}</if>
<if test="PHONE != null and PHONE != ''"> and PHONE = #{PHONE}</if>
<if test="FILENAME != null and FILENAME != ''"> and FILENAME like concat('%', #{FILENAME}, '%')</if>
<if test="CREATETIMESTAMP != null "> and CREATETIMESTAMP = #{CREATETIMESTAMP}</if>
<if test="LASTUPDATETIMESTAMP != null "> and LASTUPDATETIMESTAMP = #{LASTUPDATETIMESTAMP}</if>
</where>
</select>
<select id="selectDrawWhitelistById" parameterType="String" resultMap="DrawWhitelistResult">
<include refid="selectDrawWhitelistVo"/>
where WHITELISTID = #{WHITELISTID}
</select>
<insert id="insertDrawWhitelist" parameterType="DrawWhitelist">
insert into draw_whitelist
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="WHITELISTID != null and WHITELISTID != ''">WHITELISTID,</if>
<if test="PHONE != null and PHONE != ''">PHONE,</if>
<if test="FILENAME != null">FILENAME,</if>
<if test="CREATETIMESTAMP != null">CREATETIMESTAMP,</if>
<if test="LASTUPDATETIMESTAMP != null">LASTUPDATETIMESTAMP,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="WHITELISTID != null and WHITELISTID != ''">#{WHITELISTID},</if>
<if test="PHONE != null and PHONE != ''">#{PHONE},</if>
<if test="FILENAME != null">#{FILENAME},</if>
<if test="CREATETIMESTAMP != null">#{CREATETIMESTAMP},</if>
<if test="LASTUPDATETIMESTAMP != null">#{LASTUPDATETIMESTAMP},</if>
</trim>
</insert>
<update id="updateDrawWhitelist" parameterType="DrawWhitelist">
update draw_whitelist
<trim prefix="SET" suffixOverrides=",">
<if test="PHONE != null and PHONE != ''">PHONE = #{PHONE},</if>
<if test="FILENAME != null">FILENAME = #{FILENAME},</if>
<if test="CREATETIMESTAMP != null">CREATETIMESTAMP = #{CREATETIMESTAMP},</if>
<if test="LASTUPDATETIMESTAMP != null">LASTUPDATETIMESTAMP = #{LASTUPDATETIMESTAMP},</if>
</trim>
where WHITELISTID = #{WHITELISTID}
</update>
<delete id="deleteDrawWhitelistById" parameterType="String">
delete from draw_whitelist where WHITELISTID = #{WHITELISTID}
</delete>
<delete id="deleteDrawWhitelistByIds" parameterType="String">
delete from draw_whitelist where WHITELISTID in
<foreach item="WHITELISTID" collection="array" open="(" separator="," close=")">
#{WHITELISTID}
</foreach>
</delete>
</mapper>

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

@ -450,7 +450,7 @@
</div>
</div>
</div>
<div id="step-4" class="tab-pane" role="tabpanel" aria-labelledby="step-4" style="height: 120%">
<div id="step-4" class="tab-pane" role="tabpanel" aria-labelledby="step-4" style="height: 130%">
<h4 class="form-header h4">第4步-选择玩法</h4>
<div th:with="type=${@dict.getType('activityPlay')}">
<a id="activityPlay" th:if="${dict.dictValue} != '0'" class="btn btn-rounded" href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}"
@ -459,6 +459,7 @@
th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
</div>
<input type="hidden" name="actConfig-actType" id="activityPlayval" value="">
<h4 class="form-header h4"></h4>
<div style="height: 300">
<img id="activityPlayimg" src="../../img/act/0.jpg" width="60%" height="300" style="display: none">
</div>
@ -583,6 +584,18 @@
</div>
</div>
</div>
<div class="row" style="height: 500">
<div class="form-group" style="float: left">
<div style="width: 60%">
<label class="col-sm-4 control-label is-required">规则描述：</label>
</div>
<div class="col-sm-8">
<div class="summernote">
</div>
</div>
<textarea id="drawdescribe" name="drawRule-drawdescribe" maxlength="500" class="form-control" rows="5" aria-invalid="false" placeholder="" style="display: none"></textarea>
</div>
</div>
</div>
</div>
<div id="step-5" class="tab-pane" role="tabpanel" aria-labelledby="step-5" style="height: 100%">