Skip to content

xunj / festival-activites

Go to a project
Commit 8038446f by xunj
Options

优化

1 parent 7e121f3f
Inline Side-by-side
Showing 17 changed files with 163 additions and 69 deletions
activity-admin/src/main/java/com/polysoft/activity/constant/CommonTypeEnum.java
......@@ -5,22 +5,28 @@ package com.polysoft.activity.constant;
* @date 2021/2/1
*/
public enum CommonTypeEnum {
//红包来源类型
REDPACK_SOURCE_TYPE1("1","红包雨"),
REDPACK_SOURCE_TYPE2("2","首次登录"),
REDPACK_SOURCE_TYPE3("3","补签扣除"),
REDPACK_SOURCE_TYPE4("4","集卡瓜分"),
//红包裂隙
REDPACK_TYPE1("1","普通红包"),
REDPACK_TYPE2("2","牛牌红包"),
//用户签到状态
USER_SIGN_STATUS0("0","未签到"),
USER_SIGN_STATUS1("1","已签到"),
USER_SIGN_STATUS2("2","补签");
USER_SIGN_STATUS2("2","补签"),
//红包结算状态
RED_ISENBLE_NO("0","未结算"),
RED_ISENBLE_YES("1","已结算"),
//红包雨活动状态
ACTIVITY_STATUS1("1","未开始"),
ACTIVITY_STATUS2("2","进行中"),
ACTIVITY_STATUS3("3","已结束");
//编码
private String code;
//描述
private String desc;
CommonTypeEnum(String code, String desc) {
......
activity-admin/src/main/java/com/polysoft/activity/constant/MsgCodeEnum.java
package com.polysoft.activity.constant;
public enum MsgCodeEnum {
BALANCE_NO("1001","余额不足");
BALANCE_NO("1001","余额不足"),
OPEN_CATTLE1("2001","该用户不存在"),
OPEN_CATTLE2("2002","福牛红包已被领取"),
OPEN_CATTLE3("2003","开奖时间2020-02-17 20:21:00，请少侠耐心等待");
private String code;
private String msg;
......
activity-admin/src/main/java/com/polysoft/activity/controller/CattleController.java
......@@ -55,5 +55,4 @@ public class CattleController {
return cattleBrandService.getTaskStatus(param);
}
}
activity-admin/src/main/java/com/polysoft/activity/controller/TestController.java 0 → 100644
package com.polysoft.activity.controller;
import com.polysoft.activity.constant.CommonTypeEnum;
import com.polysoft.activity.mapper.ActivityMapper;
import com.polysoft.activity.model.dto.AddRedRainDto;
import com.polysoft.activity.utils.ApiResult;
import com.polysoft.activity.utils.SnowFlakeUtil;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.Date;
/**
* @author lvyp
* @date 2021/1/29
*/
@RestController
@RequestMapping("/test")
@Api(value = "牛牌", description = "牛牌接口")
public class TestController {
@Resource
private ActivityMapper activityMapper;
@GetMapping("/testOne" )
@ResponseBody
public ApiResult testOne(@RequestParam(value = "amount") double amount) {
AddRedRainDto rainDto = new AddRedRainDto();
rainDto.setRedId(SnowFlakeUtil.nextId());
rainDto.setUserId(152L);
rainDto.setRedType(CommonTypeEnum.REDPACK_TYPE1.getCode());
rainDto.setRedAmount(BigDecimal.valueOf(0.00));
rainDto.setBatchNum(98);
rainDto.setIsEnble(CommonTypeEnum.RED_ISENBLE_NO.getCode());
rainDto.setSourceType(CommonTypeEnum.REDPACK_SOURCE_TYPE4.getCode());
rainDto.setCreateTime(new Date());
activityMapper.saveRedRainForOne(rainDto);
return ApiResult.ok(activityMapper.getRedIdToCattle(amount));
}
}
activity-admin/src/main/java/com/polysoft/activity/mapper/ActivityMapper.java
......@@ -16,6 +16,7 @@ import com.polysoft.activity.model.vo.SmashBasinVO;
import org.apache.ibatis.annotations.Param;
import org.mapstruct.Mapper;
import java.math.BigDecimal;
import java.util.List;
/**
......@@ -43,6 +44,6 @@ public interface ActivityMapper extends BaseMapper<ActItemDto> {
GrapRedPackResultVO getGrapRedPackResult(GrapRedPackResultDto dto);
List<GrapRedPackResultVO> getGrapRedRainRank(GrapRedPackResultDto dto);
RedAmountConfVO getRedAmountConf(@Param("redSource") String redSource,@Param("batchNum") Long batchNum);
List<Long> getRedIdToCattle();
List<Long> getRedIdToCattle(@Param("redAmount") double redAmount);
}
activity-admin/src/main/java/com/polysoft/activity/model/dto/QueryRedRainDto.java
......@@ -11,7 +11,7 @@ public class QueryRedRainDto {
//用户主键
private Long userId ;
//红包类型 0 普通红包 1 牛牌
private Long redType ;
private String redType ;
//0 未结算 1 已结算
private String isEnble;
//红包雨批次号
......
activity-admin/src/main/java/com/polysoft/activity/model/param/AddRedRainParam.java
......@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* @author lvyp
* @date 2021/1/28
......@@ -12,8 +14,10 @@ import lombok.Data;
public class AddRedRainParam {
@ApiModelProperty("用户主键")
private Long userId;
@ApiModelProperty("用户主键")
@ApiModelProperty("红包数量")
@NotNull(message ="红包数量不能为空" )
private int redNum;
@ApiModelProperty("用户主键")
@ApiModelProperty("红包批次号")
@NotNull(message = "红包批次号不能为空")
private int batchNum;
}
activity-admin/src/main/java/com/polysoft/activity/service/impl/ActItemServiceImpl.java
......@@ -50,20 +50,20 @@ public class ActItemServiceImpl implements ActItemService{
Long cuttentTime = System.currentTimeMillis() / 1000;
if (cuttentTime > startTime && cuttentTime < endTime) {
//正在进行
activityMapper.updateActStatus(item.getId(), "1");
item.setActivityStatus("1");
activityMapper.updateActStatus(item.getId(), CommonTypeEnum.ACTIVITY_STATUS1.getCode());
item.setActivityStatus(CommonTypeEnum.ACTIVITY_STATUS1.getCode());
item.setSurplusSecond(endTime-cuttentTime);
}
if(cuttentTime < startTime && (startTime - cuttentTime) <30){
//即将开始
activityMapper.updateActStatus(item.getId(), "2");
item.setActivityStatus("2");
activityMapper.updateActStatus(item.getId(), CommonTypeEnum.ACTIVITY_STATUS2.getCode());
item.setActivityStatus(CommonTypeEnum.ACTIVITY_STATUS2.getCode());
item.setSurplusSecond(endTime-endTime);
}
if (cuttentTime > endTime) {
//已结束
activityMapper.updateActStatus(item.getId(), "3");
item.setActivityStatus("3");
activityMapper.updateActStatus(item.getId(), CommonTypeEnum.ACTIVITY_STATUS3.getCode());
item.setActivityStatus(CommonTypeEnum.ACTIVITY_STATUS3.getCode());
item.setSurplusSecond(endTime-endTime);
}
}
......@@ -85,6 +85,7 @@ public class ActItemServiceImpl implements ActItemService{
dto.setUserId(param.getUserId());
dto.setCreateTime(date);
dto.setBatchNum(param.getBatchNum());
dto.setIsEnble(CommonTypeEnum.RED_ISENBLE_NO.getCode());
dto.setSourceType(CommonTypeEnum.REDPACK_SOURCE_TYPE1.getCode());
list.add(dto);
}
......@@ -128,7 +129,7 @@ public class ActItemServiceImpl implements ActItemService{
GrapRedPackResultDto dto = new GrapRedPackResultDto();
dto.setUserId(param.getUserId());
dto.setBatchNum(param.getBatchNum());
dto.setIsEnble("1");
dto.setIsEnble(CommonTypeEnum.RED_ISENBLE_YES.getCode());
return ApiResult.ok(activityMapper.getGrapRedPackResult(dto));
}
......@@ -138,7 +139,7 @@ public class ActItemServiceImpl implements ActItemService{
GrapRedPackResultDto dto = new GrapRedPackResultDto();
dto.setBatchNum(param.getBatchNum());
dto.setRedType(CommonTypeEnum.REDPACK_TYPE1.getCode());
dto.setIsEnble("1");
dto.setIsEnble(CommonTypeEnum.RED_ISENBLE_YES.getCode());
return ApiResult.ok(activityMapper.getGrapRedRainRank(dto));
}
......
activity-admin/src/main/java/com/polysoft/activity/service/impl/CattleBrandServiceImpl.java
......@@ -3,6 +3,7 @@ package com.polysoft.activity.service.impl;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONObject;
import com.polysoft.activity.constant.CommonTypeEnum;
import com.polysoft.activity.constant.MsgCodeEnum;
import com.polysoft.activity.mapper.ActivityMapper;
import com.polysoft.activity.mapper.CattleBrandMapper;
import com.polysoft.activity.mapper.UserInfoMapper;
......@@ -11,6 +12,7 @@ import com.polysoft.activity.model.dto.UpdateUserStatesDto;
import com.polysoft.activity.model.dto.UserInfoDto;
import com.polysoft.activity.model.dto.UserInfoForComposeStatusDto;
import com.polysoft.activity.model.param.ComposeCattleBrandParam;
import com.polysoft.activity.model.param.UserInfoParam;
import com.polysoft.activity.model.vo.CattleBrandFroUserVO;
import com.polysoft.activity.model.vo.CattleBrandVO;
import com.polysoft.activity.model.vo.CattleListVO;
......@@ -24,6 +26,7 @@ import com.polysoft.activity.utils.SnowFlakeUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Date;
......@@ -85,6 +88,12 @@ public class CattleBrandServiceImpl implements CattleBrandService {
@Override
public ApiResult saveComposeCattleBrand(ComposeCattleBrandParam param) {
JSONObject object = new JSONObject();
Long currentTime = System.currentTimeMillis()/1000;
Long guiDingTime = DateUtil.parse("2021-02-17 20:00:00","yyyy-MM-dd HH:mm:ss").getTime()/1000;
if(currentTime > guiDingTime){
object.put("isCompose",false);
return ApiResult.ok("200","非常抱歉，福牛合成时间已过，还请来年继续努力",object);
}
try {
List<UserCattleVO> list = cattleBrandMapper.getComposeCattleBrand(param.getUserId());
if(list !=null && list.size() == 5){
......@@ -95,10 +104,11 @@ public class CattleBrandServiceImpl implements CattleBrandService {
rainDto.setRedId(SnowFlakeUtil.nextId());
rainDto.setUserId(param.getUserId());
rainDto.setRedType(CommonTypeEnum.REDPACK_TYPE1.getCode());
rainDto.setCreateTime(new Date());
rainDto.setRedAmount(BigDecimal.valueOf(0.00));
rainDto.setBatchNum(98);
rainDto.setIsEnble("0");
rainDto.setIsEnble(CommonTypeEnum.RED_ISENBLE_NO.getCode());
rainDto.setSourceType(CommonTypeEnum.REDPACK_SOURCE_TYPE4.getCode());
rainDto.setCreateTime(new Date());
activityMapper.saveRedRainForOne(rainDto);
object.put("isCompose",true);
return ApiResult.ok("200","恭喜合成牛牌",object);
......@@ -114,6 +124,21 @@ public class CattleBrandServiceImpl implements CattleBrandService {
@Override
public ApiResult saveOpenCattleBrand(ComposeCattleBrandParam param) {
//判断是否已经打开过牛牌
UserInfoParam userInfoParam = new UserInfoParam();
userInfoParam.setUserId(param.getUserId());
UserInfoVO userInfoVO = userInfoMapper.queryAuthUser(userInfoParam);
if(userInfoVO == null ){
return ApiResult.ok(MsgCodeEnum.OPEN_CATTLE2.getCode(),MsgCodeEnum.OPEN_CATTLE1.getMsg());
}
if(userInfoVO != null && !"0".equals(userInfoVO.getCattleOpenStatus())){
return ApiResult.ok(MsgCodeEnum.OPEN_CATTLE2.getCode(),MsgCodeEnum.OPEN_CATTLE2.getMsg());
}
Long currentTime = System.currentTimeMillis()/1000;
Long guiDingTime = DateUtil.parse("2021-02-17 22:21:10","yyyy-MM-dd HH:mm:ss").getTime()/1000;
if(currentTime < guiDingTime){
return ApiResult.ok(MsgCodeEnum.OPEN_CATTLE2.getCode(),MsgCodeEnum.OPEN_CATTLE3.getMsg());
}
//更新0 牛牌合成未打开 1 已打开
UpdateUserStatesDto dto = new UpdateUserStatesDto();
dto.setUserId(param.getUserId());
......
activity-admin/src/main/java/com/polysoft/activity/service/impl/UserInfoServiceImpl.java
......@@ -126,7 +126,7 @@ public class UserInfoServiceImpl implements UserInfoService {
try {
//查询牛牌是否存
JSONObject object = new JSONObject();
UserCattleVO cattleVO = cattleBrandMapper.getUserCattleVOById(param.getCattleBrandId());
UserCattleVO cattleVO = cattleBrandMapper.getUserCattleVOById(param.getCattleId());
if(cattleVO == null){
object.put("cardType",param.getCardType());
object.put("isReceived",false);
......@@ -155,7 +155,7 @@ public class UserInfoServiceImpl implements UserInfoService {
try {
String today = DateUtil.format(new Date(),"yyyy-MM-dd");
List<UserSignVO> list2 = mapper.queryUserSignByUserId(param.getUserId(),today);
if(list2 != null && list2.size() > 0 ){
if(list2 != null && list2.size() > 0 && param.getSignId() == null ){
return ApiResult.ok();
}
Date date = new Date();
......@@ -164,7 +164,7 @@ public class UserInfoServiceImpl implements UserInfoService {
CattleBrandConfVO confVO = cattleBrandMapper.queryCattleBrandConf(today);
if(param.getSignId() != null){
//扣除金额
BigDecimal kouchu = BigDecimal.valueOf(-5.00);
BigDecimal kouchu = BigDecimal.valueOf(5.00);
//查询余额是否大于 5 元
UserInfoParam userInfoParam = new UserInfoParam();
userInfoParam.setUserId(param.getUserId());
......@@ -180,9 +180,9 @@ public class UserInfoServiceImpl implements UserInfoService {
rainDto.setRedId(SnowFlakeUtil.nextId());
rainDto.setUserId(param.getUserId());
rainDto.setRedAmount(BigDecimal.valueOf(-5.00));
rainDto.setRedType("0");
rainDto.setRedType(CommonTypeEnum.REDPACK_TYPE1.getCode());
rainDto.setCreateTime(date);
rainDto.setIsEnble("1");
rainDto.setIsEnble(CommonTypeEnum.RED_ISENBLE_YES.getCode());
rainDto.setSourceType(CommonTypeEnum.REDPACK_SOURCE_TYPE3.getCode());
activityMapper.saveRedRainForOne(rainDto);
List<UserInfoDto> list = new ArrayList<>();
......@@ -232,8 +232,8 @@ public class UserInfoServiceImpl implements UserInfoService {
dto.setRedId(SnowFlakeUtil.nextId());
dto.setUserId(userId);
dto.setRedAmount(redVO.getAmount());
dto.setRedType("0");
dto.setIsEnble("1");
dto.setRedType(CommonTypeEnum.REDPACK_TYPE1.getCode());
dto.setIsEnble(CommonTypeEnum.RED_ISENBLE_YES.getCode());
dto.setSourceType(CommonTypeEnum.REDPACK_SOURCE_TYPE2.getCode());
dto.setBatchNum(99);
dto.setCreateTime(new Date());
......
activity-admin/src/main/java/com/polysoft/activity/task/CattleBrandCarveUpTask.java
......@@ -34,8 +34,8 @@ public class CattleBrandCarveUpTask {
@Resource
private ActivityMapper activityMapper;
@Scheduled( cron = "0 21 20 * * ? ")
// @Scheduled( cron = "0 1 0 18 2 ? ") 2021年2月18号 0时1分0秒 执行
// @Scheduled( cron = "0 20 20 * * ? ")
@Scheduled( cron = "0 5 20 17 2 ? ") // 2021年2月17号 20时5分0秒 执行
public void execute() {
try {
sendWechat();
......@@ -43,11 +43,10 @@ public class CattleBrandCarveUpTask {
LoggerHelper.err(this.getClass(), "EpidemicForSendWechatp休眠异常:{}", e);
}
}
private static final double totalMoney = 20000.00;
private void sendWechat() {
log.info("牛牌瓜分红包任务开始");
//查询已经合成牛牌的红包
List<Long> list = activityMapper.getRedIdToCattle();
List<Long> list = activityMapper.getRedIdToCattle(0);
//第一批 牛牌瓜分
//生成数量
int count_1 = (int) (list.size()*0.05);
......@@ -66,7 +65,7 @@ public class CattleBrandCarveUpTask {
addRedRainDto.setRedId(list.get(s));
addRedRainDto.setRedAmount(BigDecimal.valueOf(redAmount_1.get(bt_1)));
addRedRainDto.setRedType(CommonTypeEnum.REDPACK_TYPE1.getCode());
addRedRainDto.setIsEnble("0");
addRedRainDto.setIsEnble(CommonTypeEnum.RED_ISENBLE_NO.getCode());
batchList_1.add(addRedRainDto);
bt_1++;
}
......@@ -88,7 +87,7 @@ public class CattleBrandCarveUpTask {
addRedRainDto.setRedId(list.get(s));
addRedRainDto.setRedAmount(BigDecimal.valueOf(redAmount_2.get(bt_2)));
addRedRainDto.setRedType(CommonTypeEnum.REDPACK_TYPE1.getCode());
addRedRainDto.setIsEnble("0");
addRedRainDto.setIsEnble(CommonTypeEnum.RED_ISENBLE_NO.getCode());
batchList_2.add(addRedRainDto);
bt_2++;
}
......@@ -109,7 +108,7 @@ public class CattleBrandCarveUpTask {
addRedRainDto.setRedId(list.get(s));
addRedRainDto.setRedAmount(BigDecimal.valueOf(redAmount_3.get(bt_3)));
addRedRainDto.setRedType(CommonTypeEnum.REDPACK_TYPE1.getCode());
addRedRainDto.setIsEnble("0");
addRedRainDto.setIsEnble(CommonTypeEnum.RED_ISENBLE_NO.getCode());
batchList_3.add(addRedRainDto);
bt_3++;
}
......@@ -130,7 +129,7 @@ public class CattleBrandCarveUpTask {
addRedRainDto.setRedId(list.get(s));
addRedRainDto.setRedAmount(BigDecimal.valueOf(redAmount_4.get(bt_4)));
addRedRainDto.setRedType(CommonTypeEnum.REDPACK_TYPE1.getCode());
addRedRainDto.setIsEnble("0");
addRedRainDto.setIsEnble(CommonTypeEnum.RED_ISENBLE_NO.getCode());
batchList_4.add(addRedRainDto);
bt_4++;
}
......@@ -158,7 +157,10 @@ public class CattleBrandCarveUpTask {
}
public static void main(String[] args) {
RedPacketUtil redpack = new RedPacketUtil();
List<Double> redAmount= redpack.getMoney(2500,15,50,300,2.1);
// List<Double> redAmount= redpack.getMoney(2000,12,100,250,2.1);
// List<Double> redAmount= redpack.getMoney(5000,35,100,250,2.1);
// List<Double> redAmount= redpack.getMoney(8000,91,50,150,2.1);
List<Double> redAmount= redpack.getMoney(5000,91,50,150,2.1);
redAmount.forEach(a -> System.out.println(a));
}
}
activity-admin/src/main/java/com/polysoft/activity/task/InitRedPackageTask1.java
......@@ -42,9 +42,10 @@ public class InitRedPackageTask1 {
private UserInfoMapper userInfoMapper;
// @Scheduled(initialDelay = 10000, fixedRate = 1*15*60*1000)
// @Scheduled( cron = "20 17 21 * * ? ")
@Scheduled( cron = "0,32 0 20 11 2 ? ") // 2月11日 20点0分32秒执行
// @Scheduled( cron = "30 50 14 * * ? ")
@Scheduled( cron = "32 0 20 11 2 ? ") // 2月11日 20点0分32秒执行
public void execute() {
System.out.println("时间正确");
sendWechat();
}
private void sendWechat(){
......@@ -55,7 +56,7 @@ public class InitRedPackageTask1 {
if(1==1){
QueryRedRainDto dto1 = new QueryRedRainDto();
List<AddRedRainDto> batchList = new ArrayList<>();
dto1.setIsEnble("0");
dto1.setIsEnble(CommonTypeEnum.RED_ISENBLE_NO.getCode());
dto1.setBatchNum(batchNum);
List<RedRainVO> list = activityMapper.queryRedRainList(dto1);
//前10%红包
......@@ -68,7 +69,7 @@ public class InitRedPackageTask1 {
AddRedRainDto addRedRainDto = BeanTransferUtils.transfer(list.get(s),AddRedRainDto.class);
addRedRainDto.setRedAmount(BigDecimal.valueOf(redAmount.get(i)));
addRedRainDto.setRedType(CommonTypeEnum.REDPACK_TYPE1.getCode());
addRedRainDto.setIsEnble("1");
addRedRainDto.setIsEnble(CommonTypeEnum.RED_ISENBLE_YES.getCode());
addRedRainDto.setSourceType(CommonTypeEnum.REDPACK_SOURCE_TYPE1.getCode());
batchList.add(addRedRainDto);
i++;
......@@ -84,7 +85,7 @@ public class InitRedPackageTask1 {
List<AddRedRainDto> batchList2 = new ArrayList<>();
//获取未结算的红包数
QueryRedRainDto dto2_1 = new QueryRedRainDto();
dto2_1.setIsEnble("0");
dto2_1.setIsEnble(CommonTypeEnum.RED_ISENBLE_NO.getCode());
dto2_1.setBatchNum(batchNum);
List<RedRainVO> list2 = activityMapper.queryRedRainList(dto2_1);
......@@ -98,7 +99,7 @@ public class InitRedPackageTask1 {
AddRedRainDto addRedRainDto = BeanTransferUtils.transfer(list2.get(s),AddRedRainDto.class);
addRedRainDto.setRedAmount(BigDecimal.valueOf(redAmount.get(i)));
addRedRainDto.setRedType(CommonTypeEnum.REDPACK_TYPE1.getCode());
addRedRainDto.setIsEnble("1");
addRedRainDto.setIsEnble(CommonTypeEnum.RED_ISENBLE_YES.getCode());
addRedRainDto.setSourceType(CommonTypeEnum.REDPACK_SOURCE_TYPE1.getCode());
batchList2.add(addRedRainDto);
i++;
......@@ -113,7 +114,7 @@ public class InitRedPackageTask1 {
List<AddRedRainDto> batchList2 = new ArrayList<>();
//获取未结算的红包数
QueryRedRainDto dto3_1 = new QueryRedRainDto();
dto3_1.setIsEnble("0");
dto3_1.setIsEnble(CommonTypeEnum.RED_ISENBLE_NO.getCode());
dto3_1.setBatchNum(batchNum);
List<RedRainVO> list2 = activityMapper.queryRedRainList(dto3_1);
//前65%红包
......@@ -126,7 +127,7 @@ public class InitRedPackageTask1 {
AddRedRainDto addRedRainDto = BeanTransferUtils.transfer(list2.get(s),AddRedRainDto.class);
addRedRainDto.setRedAmount(BigDecimal.valueOf(redAmount.get(i)));
addRedRainDto.setRedType(CommonTypeEnum.REDPACK_TYPE1.getCode());
addRedRainDto.setIsEnble("1");
addRedRainDto.setIsEnble(CommonTypeEnum.RED_ISENBLE_YES.getCode());
addRedRainDto.setSourceType(CommonTypeEnum.REDPACK_SOURCE_TYPE1.getCode());
batchList2.add(addRedRainDto);
i++;
......@@ -141,7 +142,7 @@ public class InitRedPackageTask1 {
List<AddRedRainDto> batchList2 = new ArrayList<>();
//获取未结算的红包数
QueryRedRainDto dto4_1 = new QueryRedRainDto();
dto4_1.setIsEnble("0");
dto4_1.setIsEnble(CommonTypeEnum.RED_ISENBLE_NO.getCode());
dto4_1.setBatchNum(batchNum);
List<RedRainVO> list2 = activityMapper.queryRedRainList(dto4_1);
//前5%红包牛牌
......@@ -154,7 +155,7 @@ public class InitRedPackageTask1 {
int k = new Random().nextInt(5);
addRedRainDto.setCattleBrandId(cattleList.get(k).getCattleId());
addRedRainDto.setRedType(CommonTypeEnum.REDPACK_TYPE2.getCode());
addRedRainDto.setIsEnble("1");
addRedRainDto.setIsEnble(CommonTypeEnum.RED_ISENBLE_YES.getCode());
addRedRainDto.setSourceType(CommonTypeEnum.REDPACK_SOURCE_TYPE1.getCode());
batchList2.add(addRedRainDto);
i++;
......
activity-admin/src/main/java/com/polysoft/activity/task/InitRedPackageTask2.java
......@@ -46,7 +46,7 @@ public class InitRedPackageTask2 {
// @Scheduled(initialDelay = 10000, fixedRate = 1*15*60*1000)
// @Scheduled( cron = "20 17 21 * * ? ")
@Scheduled( cron = "0,32 0 22 11 2 ? ") // 2月11日 22点0分32秒执行
@Scheduled( cron = "32 0 22 11 2 ? ") // 2月11日 22点0分32秒执行
public void execute() {
sendWechat();
}
......@@ -59,7 +59,7 @@ public class InitRedPackageTask2 {
if(1==1){
QueryRedRainDto dto1 = new QueryRedRainDto();
List<AddRedRainDto> batchList = new ArrayList<>();
dto1.setIsEnble("0");
dto1.setIsEnble(CommonTypeEnum.RED_ISENBLE_NO.getCode());
dto1.setBatchNum(batchNum);
List<RedRainVO> list = activityMapper.queryRedRainList(dto1);
//前10%红包
......@@ -72,7 +72,7 @@ public class InitRedPackageTask2 {
AddRedRainDto addRedRainDto = BeanTransferUtils.transfer(list.get(s),AddRedRainDto.class);
addRedRainDto.setRedAmount(BigDecimal.valueOf(redAmount.get(i)));
addRedRainDto.setRedType(CommonTypeEnum.REDPACK_TYPE1.getCode());
addRedRainDto.setIsEnble("1");
addRedRainDto.setIsEnble(CommonTypeEnum.RED_ISENBLE_YES.getCode());
addRedRainDto.setSourceType(CommonTypeEnum.REDPACK_SOURCE_TYPE1.getCode());
batchList.add(addRedRainDto);
i++;
......@@ -88,7 +88,7 @@ public class InitRedPackageTask2 {
List<AddRedRainDto> batchList2 = new ArrayList<>();
//获取未结算的红包数
QueryRedRainDto dto2_1 = new QueryRedRainDto();
dto2_1.setIsEnble("0");
dto2_1.setIsEnble(CommonTypeEnum.RED_ISENBLE_NO.getCode());
dto2_1.setBatchNum(batchNum);
List<RedRainVO> list2 = activityMapper.queryRedRainList(dto2_1);
......@@ -102,7 +102,7 @@ public class InitRedPackageTask2 {
AddRedRainDto addRedRainDto = BeanTransferUtils.transfer(list2.get(s),AddRedRainDto.class);
addRedRainDto.setRedAmount(BigDecimal.valueOf(redAmount.get(i)));
addRedRainDto.setRedType(CommonTypeEnum.REDPACK_TYPE1.getCode());
addRedRainDto.setIsEnble("1");
addRedRainDto.setIsEnble(CommonTypeEnum.RED_ISENBLE_YES.getCode());
addRedRainDto.setSourceType(CommonTypeEnum.REDPACK_SOURCE_TYPE1.getCode());
batchList2.add(addRedRainDto);
i++;
......@@ -117,7 +117,7 @@ public class InitRedPackageTask2 {
List<AddRedRainDto> batchList2 = new ArrayList<>();
//获取未结算的红包数
QueryRedRainDto dto3_1 = new QueryRedRainDto();
dto3_1.setIsEnble("0");
dto3_1.setIsEnble(CommonTypeEnum.RED_ISENBLE_NO.getCode());
dto3_1.setBatchNum(batchNum);
List<RedRainVO> list2 = activityMapper.queryRedRainList(dto3_1);
//前65%红包
......@@ -130,7 +130,7 @@ public class InitRedPackageTask2 {
AddRedRainDto addRedRainDto = BeanTransferUtils.transfer(list2.get(s),AddRedRainDto.class);
addRedRainDto.setRedAmount(BigDecimal.valueOf(redAmount.get(i)));
addRedRainDto.setRedType(CommonTypeEnum.REDPACK_TYPE1.getCode());
addRedRainDto.setIsEnble("1");
addRedRainDto.setIsEnble(CommonTypeEnum.RED_ISENBLE_YES.getCode());
addRedRainDto.setSourceType(CommonTypeEnum.REDPACK_SOURCE_TYPE1.getCode());
batchList2.add(addRedRainDto);
i++;
......@@ -145,7 +145,7 @@ public class InitRedPackageTask2 {
List<AddRedRainDto> batchList2 = new ArrayList<>();
//获取未结算的红包数
QueryRedRainDto dto4_1 = new QueryRedRainDto();
dto4_1.setIsEnble("0");
dto4_1.setIsEnble(CommonTypeEnum.RED_ISENBLE_NO.getCode());
dto4_1.setBatchNum(batchNum);
List<RedRainVO> list2 = activityMapper.queryRedRainList(dto4_1);
//前5%红包牛牌
......@@ -158,7 +158,7 @@ public class InitRedPackageTask2 {
int k = new Random().nextInt(5);
addRedRainDto.setCattleBrandId(cattleList.get(k).getCattleId());
addRedRainDto.setRedType(CommonTypeEnum.REDPACK_TYPE2.getCode());
addRedRainDto.setIsEnble("1");
addRedRainDto.setIsEnble(CommonTypeEnum.RED_ISENBLE_YES.getCode());
addRedRainDto.setSourceType(CommonTypeEnum.REDPACK_SOURCE_TYPE1.getCode());
batchList2.add(addRedRainDto);
i++;
......
activity-admin/src/main/java/com/polysoft/activity/task/InitRedPackageTask3.java
......@@ -46,7 +46,7 @@ public class InitRedPackageTask3 {
// @Scheduled(initialDelay = 10000, fixedRate = 1*15*60*1000)
// @Scheduled( cron = "20 17 21 * * ? ")
@Scheduled( cron = "0,32 0 0 12 2 ? ") // 2月12日 0时0点0分32秒执行
@Scheduled( cron = "32 0 0 12 2 ? ") // 2月12日 0时0点0分32秒执行
public void execute() {
sendWechat();
}
......@@ -59,7 +59,7 @@ public class InitRedPackageTask3 {
if(1==1){
QueryRedRainDto dto1 = new QueryRedRainDto();
List<AddRedRainDto> batchList = new ArrayList<>();
dto1.setIsEnble("0");
dto1.setIsEnble(CommonTypeEnum.RED_ISENBLE_NO.getCode());
dto1.setBatchNum(batchNum);
List<RedRainVO> list = activityMapper.queryRedRainList(dto1);
//前10%红包
......@@ -72,7 +72,7 @@ public class InitRedPackageTask3 {
AddRedRainDto addRedRainDto = BeanTransferUtils.transfer(list.get(s),AddRedRainDto.class);
addRedRainDto.setRedAmount(BigDecimal.valueOf(redAmount.get(i)));
addRedRainDto.setRedType(CommonTypeEnum.REDPACK_TYPE1.getCode());
addRedRainDto.setIsEnble("1");
addRedRainDto.setIsEnble(CommonTypeEnum.RED_ISENBLE_YES.getCode());
addRedRainDto.setSourceType(CommonTypeEnum.REDPACK_SOURCE_TYPE1.getCode());
batchList.add(addRedRainDto);
i++;
......@@ -88,7 +88,7 @@ public class InitRedPackageTask3 {
List<AddRedRainDto> batchList2 = new ArrayList<>();
//获取未结算的红包数
QueryRedRainDto dto2_1 = new QueryRedRainDto();
dto2_1.setIsEnble("0");
dto2_1.setIsEnble(CommonTypeEnum.RED_ISENBLE_NO.getCode());
dto2_1.setBatchNum(batchNum);
List<RedRainVO> list2 = activityMapper.queryRedRainList(dto2_1);
......@@ -102,7 +102,7 @@ public class InitRedPackageTask3 {
AddRedRainDto addRedRainDto = BeanTransferUtils.transfer(list2.get(s),AddRedRainDto.class);
addRedRainDto.setRedAmount(BigDecimal.valueOf(redAmount.get(i)));
addRedRainDto.setRedType(CommonTypeEnum.REDPACK_TYPE1.getCode());
addRedRainDto.setIsEnble("1");
addRedRainDto.setIsEnble(CommonTypeEnum.RED_ISENBLE_YES.getCode());
addRedRainDto.setSourceType(CommonTypeEnum.REDPACK_SOURCE_TYPE1.getCode());
batchList2.add(addRedRainDto);
i++;
......@@ -117,7 +117,7 @@ public class InitRedPackageTask3 {
List<AddRedRainDto> batchList2 = new ArrayList<>();
//获取未结算的红包数
QueryRedRainDto dto3_1 = new QueryRedRainDto();
dto3_1.setIsEnble("0");
dto3_1.setIsEnble(CommonTypeEnum.RED_ISENBLE_NO.getCode());
dto3_1.setBatchNum(batchNum);
List<RedRainVO> list2 = activityMapper.queryRedRainList(dto3_1);
//前65%红包
......@@ -130,7 +130,7 @@ public class InitRedPackageTask3 {
AddRedRainDto addRedRainDto = BeanTransferUtils.transfer(list2.get(s),AddRedRainDto.class);
addRedRainDto.setRedAmount(BigDecimal.valueOf(redAmount.get(i)));
addRedRainDto.setRedType(CommonTypeEnum.REDPACK_TYPE1.getCode());
addRedRainDto.setIsEnble("1");
addRedRainDto.setIsEnble(CommonTypeEnum.RED_ISENBLE_YES.getCode());
addRedRainDto.setSourceType(CommonTypeEnum.REDPACK_SOURCE_TYPE1.getCode());
batchList2.add(addRedRainDto);
i++;
......@@ -145,7 +145,7 @@ public class InitRedPackageTask3 {
List<AddRedRainDto> batchList2 = new ArrayList<>();
//获取未结算的红包数
QueryRedRainDto dto4_1 = new QueryRedRainDto();
dto4_1.setIsEnble("0");
dto4_1.setIsEnble(CommonTypeEnum.RED_ISENBLE_NO.getCode());
dto4_1.setBatchNum(batchNum);
List<RedRainVO> list2 = activityMapper.queryRedRainList(dto4_1);
//前5%红包牛牌
......@@ -158,7 +158,7 @@ public class InitRedPackageTask3 {
int k = new Random().nextInt(5);
addRedRainDto.setCattleBrandId(cattleList.get(k).getCattleId());
addRedRainDto.setRedType(CommonTypeEnum.REDPACK_TYPE2.getCode());
addRedRainDto.setIsEnble("1");
addRedRainDto.setIsEnble(CommonTypeEnum.RED_ISENBLE_YES.getCode());
addRedRainDto.setSourceType(CommonTypeEnum.REDPACK_SOURCE_TYPE1.getCode());
batchList2.add(addRedRainDto);
i++;
......
activity-admin/src/main/java/com/polysoft/activity/task/UserSignTask.java
......@@ -30,7 +30,7 @@ public class UserSignTask {
* 补签任务
*/
// @Scheduled( cron = "0 21 20 * * ? ")
@Scheduled( cron = "0 1 0 12,13,14,15,16,17,18 2 ? ") //2月12,13,14,15,16,17,18 0时1分0秒执行
@Scheduled( cron = "0 5 0 12,13,14,15,16,17 2 ? ") //2月12,13,14,15,16,17 0时5分0秒执行
public void execute() {
try {
sendWechat();
......
activity-admin/src/main/java/com/polysoft/activity/task/WishLuckDrawTask.java
......@@ -32,7 +32,7 @@ public class WishLuckDrawTask {
private WishRealPrizeMapper wishRealPrizeMapper;
// @Scheduled( cron = "0 21 20 * * ? ")
@Scheduled( cron = "0 21 20 11,12,13,14,15,16,17 2 ? ")//2月11,12,13,14,15,16,17, 020时21分0秒执行
@Scheduled( cron = "0 20 20 11,12,13,14,15,16,17 2 ? ")//2月11,12,13,14,15,16,17, 20时20分0秒执行
public void execute() {
try {
sendWechat();
......
activity-admin/src/main/resources/mapper/ActivityMapper.xml
......@@ -29,6 +29,7 @@
user_id,
red_amount,
red_type,
is_enble,
batch_num,
create_time,
source_type
......@@ -258,5 +259,8 @@
WHERE
red_amount = 0.00
AND source_type = '4' and is_enble='0'
<if test="redAmount != null">
and red_amount = #{redAmount}
</if>
</select>
</mapper>
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!