Skip to content

A
answer-backend
Commit 3bd3d553 by 唐聪
Options

添加活动介绍相关代码

parent dcef1aaf
Showing with 843 additions and 5 deletions
admin-server/src/main/java/com/zq/admin/modules/system/rest/MenuController.java
...@@ -118,10 +118,14 @@ public class MenuController { ...@@ -118,10 +118,14 @@ public class MenuController {
if (resources.getId() != null) { if (resources.getId() != null) {
throw new BadRequestException("A new " + ENTITY_NAME + " cannot already have an ID"); throw new BadRequestException("A new " + ENTITY_NAME + " cannot already have an ID");
} }
if (resources.getIFrame() == null) {
resources.setIFrame(false);
}
menuService.create(resources); menuService.create(resources);
return new ResponseEntity<>(HttpStatus.CREATED); return new ResponseEntity<>(HttpStatus.CREATED);
} }
@Log("修改菜单") @Log("修改菜单")
@ApiOperation("修改菜单") @ApiOperation("修改菜单")
@PutMapping @PutMapping
......
api-server/src/main/java/com/zq/api/controller/AppController.java
...@@ -50,6 +50,7 @@ public class AppController { ...@@ -50,6 +50,7 @@ public class AppController {
public ApiResp action(HttpServletRequest request, ApiForm form) { public ApiResp action(HttpServletRequest request, ApiForm form) {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
// 不处理Request Method:OPTIONS的请求 // 不处理Request Method:OPTIONS的请求
if ("OPTIONS".equals(request.getMethod())) { if ("OPTIONS".equals(request.getMethod())) {
return ApiUtils.getSuccessResp(form); return ApiUtils.getSuccessResp(form);
......
api-server/src/main/java/com/zq/api/service/IApiLogic.java
...@@ -11,6 +11,7 @@ import com.zq.api.form.ApiResp; ...@@ -11,6 +11,7 @@ import com.zq.api.form.ApiResp;
*/ */
public interface IApiLogic extends IApiCommon { public interface IApiLogic extends IApiCommon {
@ApiMethod(name = "微信登录", service = "USER-SERVER") @ApiMethod(name = "微信登录", service = "USER-SERVER")
ApiResp wxLogin(ApiForm form); ApiResp wxLogin(ApiForm form);
...@@ -23,6 +24,7 @@ public interface IApiLogic extends IApiCommon { ...@@ -23,6 +24,7 @@ public interface IApiLogic extends IApiCommon {
@ApiMethod(name = "获取微信用户信息", service = "USER-SERVER") @ApiMethod(name = "获取微信用户信息", service = "USER-SERVER")
ApiResp getWxUserInfo(ApiForm form); ApiResp getWxUserInfo(ApiForm form);
/** /**
* 答题 * 答题
* *
...@@ -95,6 +97,7 @@ public interface IApiLogic extends IApiCommon { ...@@ -95,6 +97,7 @@ public interface IApiLogic extends IApiCommon {
*/ */
ApiResp delAddress(ApiForm form); ApiResp delAddress(ApiForm form);
/** /**
* 获取地址 * 获取地址
* *
......
api-server/src/main/resources/application.yml
...@@ -73,3 +73,4 @@ mybatis-plus: ...@@ -73,3 +73,4 @@ mybatis-plus:
update-strategy: not_empty update-strategy: not_empty
#logging.level.com.zq.drug.dao: debug #logging.level.com.zq.drug.dao: debug
user-server/src/main/java/com/zq/user/Swagger.java
...@@ -24,7 +24,7 @@ public class Swagger { ...@@ -24,7 +24,7 @@ public class Swagger {
.groupName("admin") .groupName("admin")
.enable(!"product".equals(profile)) //生产环境关闭 .enable(!"product".equals(profile)) //生产环境关闭
.select() .select()
.apis(RequestHandlerSelectors.basePackage("com.zq.user.controller.admin")) .apis(RequestHandlerSelectors.basePackage("com.zq.user.controller"))
.paths(PathSelectors.any()) .paths(PathSelectors.any())
.build() .build()
.apiInfo(apiInfo()); .apiInfo(apiInfo());
...@@ -43,7 +43,7 @@ public class Swagger { ...@@ -43,7 +43,7 @@ public class Swagger {
.groupName("app") .groupName("app")
.enable(!"product".equals(profile)) //生产环境关闭 .enable(!"product".equals(profile)) //生产环境关闭
.select() .select()
.apis(RequestHandlerSelectors.basePackage("com.zq.user.controller.app")) .apis(RequestHandlerSelectors.basePackage("com.zq.user.controller"))
.paths(PathSelectors.any()) .paths(PathSelectors.any())
.build() .build()
.apiInfo(appInfo()); .apiInfo(appInfo());
......
user-server/src/main/java/com/zq/user/controller/LotteryInfoController.java 0 → 100644
package com.zq.user.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zq.common.utils.AssertUtils;
import com.zq.common.vo.ResultVo;
import com.zq.user.dao.LotteryInfoDao;
import com.zq.user.entity.LotteryInfo;
import com.zq.user.entity.PrizeType;
import com.zq.user.service.LotteryInfoService;
import com.zq.user.vo.LotteryInfoVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;
/**
* (LotteryInfo)表控制层
*
* @author makejava
* @since 2022-08-13 14:49:30
*/
@Api(tags = "抽奖活动信息")
@RequiredArgsConstructor
@RestController
@RequestMapping(value = "/user/lotteryInfo")
public class LotteryInfoController {
private final LotteryInfoDao lotteryInfoDao;
/**
* 服务对象
*/
@Resource
private LotteryInfoService lotteryInfoService;
/**
* 分页查询所有数据
*
* @return 所有数据
*/
@ApiOperation("获取所有活动介绍列表")
@PostMapping(value = "/getAllLotteryInfo")
public ResultVo getAllLotteryInfo(@RequestBody LotteryInfoVo vo) {
return ResultVo.success(lotteryInfoService.getLotteryInfo(vo));
}
/**
* 查询开启的抽奖
*
* @return 所有数据
*/
@ApiOperation("查询开启的抽奖")
@PostMapping(value = "/getLotteryInfoIsOpen")
public ResultVo getLotteryInfoIsOpen(@RequestBody LotteryInfoVo vo) {
return ResultVo.success(lotteryInfoService.getLotteryInfo(vo));
}
/**
* 添加活动介绍
*
* @return 添加活动介绍
*/
@ApiOperation("添加活动介绍")
@PostMapping(value = "/addAllLotteryInfo")
public ResultVo addAllLotteryInfo(@RequestBody LotteryInfoVo vo) {
AssertUtils.isTrue(vo != null, "传入信息为空");
lotteryInfoService.addLotteryInfo(vo);
return ResultVo.success("成功添加数据");
}
/**
* 查看活动介绍
*
* @return 查看活动介绍
*/
@ApiOperation("查看活动介绍")
@PostMapping(value = "/getLotteryInfo")
public ResultVo getLotteryInfo(@RequestBody LotteryInfoVo vo) {
AssertUtils.isTrue(vo.getId() != null, "传入id为空");
return ResultVo.success(lotteryInfoService.getLotteryInfoByOne(vo));
}
/**
* 修改活动介绍
*
* @return 修改活动介绍
*/
@ApiOperation("修改活动介绍")
@PutMapping(value = "/update")
public ResultVo updateLotteryInfo(@RequestBody LotteryInfoVo vo) {
AssertUtils.isTrue(vo.getId() != null, "传入id为空");
lotteryInfoService.updateLotteryInfo(vo);
return ResultVo.success();
}
/**
* 是否开启活动
*
* @return
*/
@ApiOperation("是否开启活动")
@PostMapping(value = "/isOpen")
public ResultVo isOpen(@RequestBody LotteryInfoVo vo) {
AssertUtils.isTrue(vo.getIsOpen() != null, "传入开关状态为空");
AssertUtils.isTrue(lotteryInfoDao.selectList(new QueryWrapper<LotteryInfo>().eq("isOpen", 1)) != null, "已经存在一个开启的活动");
lotteryInfoService.isOpen(vo);
return ResultVo.success("操作成功");
}
}
user-server/src/main/java/com/zq/user/controller/LotteryPrizeController.java 0 → 100644
//package com.zq.user.controller;
//
//
//
//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
//import com.baomidou.mybatisplus.extension.api.ApiController;
//import com.baomidou.mybatisplus.extension.api.R;
//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
//import com.zq.user.entity.LotteryPrize;
//import com.zq.user.service.LotteryPrizeService;
//import org.springframework.web.bind.annotation.*;
//
//import javax.annotation.Resource;
//import java.io.Serializable;
//import java.util.List;
//
///**
// * (LotteryPrize)表控制层
// *
// * @author makejava
// * @since 2022-08-13 14:49:23
// */
//@RestController
//@RequestMapping(value = "/user/lotteryPrize")
//public class LotteryPrizeController {
// /**
// * 服务对象
// */
// @Resource
// private LotteryPrizeService lotteryPrizeService;
//
// /**
// * 分页查询所有数据
// *
// * @param page 分页对象
// * @param lotteryPrize 查询实体
// * @return 所有数据
// */
// @GetMapping
// public R selectAll(Page<LotteryPrize> page, LotteryPrize lotteryPrize) {
// return success(this.lotteryPrizeService.page(page, new QueryWrapper<>(lotteryPrize)));
// }
//
// /**
// * 通过主键查询单条数据
// *
// * @param id 主键
// * @return 单条数据
// */
// @GetMapping("{id}")
// public R selectOne(@PathVariable Serializable id) {
// return success(this.lotteryPrizeService.getById(id));
// }
//
// /**
// * 新增数据
// *
// * @param lotteryPrize 实体对象
// * @return 新增结果
// */
// @PostMapping
// public R insert(@RequestBody LotteryPrize lotteryPrize) {
// return success(this.lotteryPrizeService.save(lotteryPrize));
// }
//
// /**
// * 修改数据
// *
// * @param lotteryPrize 实体对象
// * @return 修改结果
// */
// @PutMapping
// public R update(@RequestBody LotteryPrize lotteryPrize) {
// return success(this.lotteryPrizeService.updateById(lotteryPrize));
// }
//
// /**
// * 删除数据
// *
// * @param idList 主键结合
// * @return 删除结果
// */
// @DeleteMapping
// public R delete(@RequestParam("idList") List<Long> idList) {
// return success(this.lotteryPrizeService.removeByIds(idList));
// }
//}
//
user-server/src/main/java/com/zq/user/controller/PrizeController.java
...@@ -28,8 +28,10 @@ import java.util.List; ...@@ -28,8 +28,10 @@ import java.util.List;
@RequestMapping(value = "/user/prize") @RequestMapping(value = "/user/prize")
public class PrizeController { public class PrizeController {
private final PrizeService prizeService; private final PrizeService prizeService;
@ApiOperation("获取全部奖品类型") @ApiOperation("获取全部奖品类型")
@GetMapping(value = "/getAllPrizeType") @GetMapping(value = "/getAllPrizeType")
public ResultVo<List<PrizeType>> getAllPrizeType() { public ResultVo<List<PrizeType>> getAllPrizeType() {
......
user-server/src/main/java/com/zq/user/controller/QuestionController.java
...@@ -4,6 +4,7 @@ import com.zq.common.utils.AssertUtils; ...@@ -4,6 +4,7 @@ import com.zq.common.utils.AssertUtils;
import com.zq.common.vo.IdVo; import com.zq.common.vo.IdVo;
import com.zq.common.vo.PageVo; import com.zq.common.vo.PageVo;
import com.zq.common.vo.ResultVo; import com.zq.common.vo.ResultVo;
import com.zq.user.entity.AnswerRec;
import com.zq.user.entity.Question; import com.zq.user.entity.Question;
import com.zq.user.entity.QuestionType; import com.zq.user.entity.QuestionType;
import com.zq.user.service.QuestionService; import com.zq.user.service.QuestionService;
...@@ -71,4 +72,10 @@ public class QuestionController { ...@@ -71,4 +72,10 @@ public class QuestionController {
return ResultVo.success(questionService.getQuestion(questionId)); return ResultVo.success(questionService.getQuestion(questionId));
} }
// @ApiOperation("获取答题记录")
// @GetMapping(value = "/getAnswerRecs")
// public ResultVo getAnswerRecs( ) {
// return ResultVo.success(questionService.getQuestion(questionId));
// }
} }
user-server/src/main/java/com/zq/user/dao/LotteryInfoDao.java 0 → 100644
package com.zq.user.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zq.user.entity.LotteryInfo;
/**
* (LotteryInfo)表数据库访问层
*
* @author makejava
* @since 2022-08-13 14:45:07
*/
public interface LotteryInfoDao extends BaseMapper<LotteryInfo> {
}
user-server/src/main/java/com/zq/user/dao/LotteryPrizeDao.java 0 → 100644
package com.zq.user.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zq.user.entity.LotteryPrize;
/**
* (LotteryPrize)表数据库访问层
*
* @author makejava
* @since 2022-08-13 14:47:23
*/
public interface LotteryPrizeDao extends BaseMapper<LotteryPrize> {
}
user-server/src/main/java/com/zq/user/entity/LotteryInfo.java 0 → 100644
package com.zq.user.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
@TableName(value = "t_lottery_info")
public
class LotteryInfo implements Serializable {
private static final long serialVersionUID = -54616667495565039L;
/**
* 自增主键
*/
@ApiModelProperty(value = "自增主键")
@TableId(type = IdType.AUTO)
private Integer id;
/**
* 抽奖活动名
*/
@ApiModelProperty(value = "抽奖活动名")
private String lotteryInfoName;
/**
* 活动介绍
*/
@ApiModelProperty(value = "活动介绍 ")
private String remark;
/**
* 是否启用该抽奖
*
*/
@ApiModelProperty(value = "是否启用该抽奖 1 启用 2 关闭 ")
private Integer isOpen;
/**
* 开始时间
*/
@ApiModelProperty(value = "开始时间")
private Date startTime;
/**
* 结束时间
*/
@ApiModelProperty(value = "结束时间")
private Date endTime;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**
* 修改时间
*/
@ApiModelProperty(value = "修改时间")
private Date updateTime;
}
user-server/src/main/java/com/zq/user/entity/LotteryPrize.java 0 → 100644
package com.zq.user.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
@TableName(value = "t_lottery_prize")
public
class LotteryPrize implements Serializable {
private static final long serialVersionUID = 555524069435437231L;
/**
* 自增主键
*/
@ApiModelProperty(value = "自增主键")
@TableId(type = IdType.AUTO)
private Integer id;
/**
* 奖品类型 关联奖品类型(t_prize_type)表id
*/
@ApiModelProperty(value = "奖品类型 关联奖品类型(t_prize_type)表id")
// todo 2022813 Integer改为了long
private Integer prizeTypeId;
/**
* 奖品名
*/
@ApiModelProperty(value = "奖品名")
private String prizeName;
/**
* 所属抽奖活动 关联奖品类型(t_lottery_info)表id
*/
@ApiModelProperty(value = "所属抽奖活动 关联奖品类型(t_lottery_info)表id")
private Integer lotteryInfoId;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**
* 修改时间
*/
@ApiModelProperty(value = "修改时间")
private Date updateTime;
}
user-server/src/main/java/com/zq/user/service/LotteryInfoService.java 0 → 100644
package com.zq.user.service;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.db.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zq.common.utils.AssertUtils;
import com.zq.common.utils.PagingUtils;
import com.zq.common.utils.UuidUtils;
import com.zq.common.vo.PageVo;
import com.zq.user.dao.LotteryInfoDao;
import com.zq.user.dao.LotteryPrizeDao;
import com.zq.user.dao.PrizeDao;
import com.zq.user.dao.PrizeTypeDao;
import com.zq.user.entity.LotteryInfo;
import com.zq.user.entity.LotteryPrize;
import com.zq.user.entity.Prize;
import com.zq.user.entity.PrizeType;
import com.zq.user.vo.LotteryInfoVo;
import com.zq.user.vo.LotteryPrizeVo;
import com.zq.user.vo.PrizeFindVo;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Random;
/**
* (LotteryInfo)表服务接口
*
* @author makejava
* @since 2022-08-13 14:48:18
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class LotteryInfoService {
private final LotteryInfoDao lotteryInfoDao;
private final LotteryPrizeDao lotteryPrizeDao;
private final PrizeDao prizeDao;
public void addLotteryInfo(LotteryInfoVo vo) {
vo.setCreateTime(DateUtil.date());
// List<LotteryPrizeVo> list = vo.getPrizeVos();
Integer id = Integer.parseInt(generateRandom());
vo.setId(id);
// todo 2022813 这里的关联的类型标是type而不是type_id
LotteryInfo lotteryInfo = new LotteryInfo();
BeanUtil.copyProperties(vo, lotteryInfo);
lotteryInfo.setIsOpen(2);
lotteryInfoDao.insert(lotteryInfo);
List<Integer> idList = vo.getListId();
for (Integer prizeId : idList) {
Prize type = prizeDao.selectById(prizeId);
LotteryPrize lotteryPrize = LotteryPrize
.builder()
.lotteryInfoId(vo.getId())
.prizeTypeId(type.getPrizeTypeId())
.prizeName(type.getPrizeName())
.createTime(DateUtil.date())
.build();
lotteryPrizeDao.insert(lotteryPrize);
}
}
public static synchronized String generateRandom(){
//使用当前时间生成时间戳yyyyMMddHHmmssSSS
StringBuffer suf = new StringBuffer(DateFormatUtils.format(Calendar.getInstance(), "ssSSS"));
//生成3位随机数
suf.append(RandomStringUtils.randomNumeric(3));
return suf.toString();
}
// public PageVo<Prize> getPrizeList(PrizeFindVo vo) {
// LambdaQueryWrapper<Prize> lambdaQuery = Wrappers.lambdaQuery(Prize.class);
// lambdaQuery.orderByDesc(Prize::getCreateTime);
//
// if (StrUtil.isNotBlank(vo.getPrizeName())) {
// lambdaQuery.like(Prize::getPrizeName, vo.getPrizeName());
// }
//
// PageVo<Prize> paging = PagingUtils.paging(vo, prizeDao, lambdaQuery, Prize.class);
// paging.getRows().forEach(prize -> {
// if (prize.getPrizeTypeId() != null) {
// PrizeType prizeType = prizeTypeDao.selectById(prize.getPrizeTypeId());
// prize.setPrizeTypeName(prizeType.getTypeName());
// }
// });
// return paging;
// }
public PageVo<LotteryInfoVo> getLotteryInfo(LotteryInfoVo vo) {
LambdaQueryWrapper<LotteryInfo> lambdaQuery = Wrappers.lambdaQuery(LotteryInfo.class);
lambdaQuery.orderByDesc(LotteryInfo::getCreateTime);
PageVo<LotteryInfo> paging = PagingUtils.paging(vo, lotteryInfoDao, lambdaQuery, LotteryInfo.class);
List<LotteryInfoVo> infoVos = new ArrayList<>();
List<LotteryInfo> infos = paging.getRows();
for (LotteryInfo info : infos) {
LotteryInfoVo infoVo = new LotteryInfoVo();
BeanUtil.copyProperties(info, infoVo);
List<LotteryPrize> lotteryPrizeVos = lotteryPrizeDao.selectList(new QueryWrapper<LotteryPrize>().eq("lottery_info_id", info.getId()));
infoVo.setPrizeVos(lotteryPrizeVos);
infoVos.add(infoVo);
}
PageVo<LotteryInfoVo> page = new PageVo<>();
page.setTotal(paging.getTotal());
page.setRows(infoVos);
page.setSize(paging.getSize());
page.setStart(paging.getStart());
return page;
}
public void isOpen(LotteryInfoVo vo) {
AssertUtils.isTrue(lotteryInfoDao.selectList(new QueryWrapper<LotteryInfo>().eq("isOpen", 1)) != null, "已经存在一个开启的活动");
if (vo.getIsOpen() != null) {
if (vo.getIsOpen() == 2) {
LotteryInfo info = new LotteryInfo();
info.setIsOpen(2);
lotteryInfoDao.updateById(info);
} else if (vo.getIsOpen() == 1) {
LotteryInfo info = new LotteryInfo();
info.setIsOpen(1);
lotteryInfoDao.updateById(info);
}
}
}
public LotteryInfoVo getLotteryInfoByOne(LotteryInfoVo vo) {
// LambdaQueryWrapper<LotteryInfo> lambdaQuery = Wrappers.lambdaQuery(LotteryInfo.class);
// lambdaQuery.orderByDesc(LotteryInfo::getCreateTime);
// PageVo<LotteryInfo> paging = PagingUtils.paging(vo, lotteryInfoDao, lambdaQuery, LotteryInfo.class);
// List<LotteryInfoVo> infoVos = new ArrayList<>();
// List<LotteryInfo> infos = paging.getRows();
// for (LotteryInfo info : infos) {
// LotteryInfoVo infoVo = new LotteryInfoVo();
// BeanUtil.copyProperties(info, infoVo);
// List<LotteryPrize> lotteryPrizeVos = lotteryPrizeDao.selectList(new QueryWrapper<LotteryPrize>().eq("lottery_info_id", info.getId()));
// List<LotteryPrizeVo> prizeVos = new ArrayList<>();
// BeanUtil.copyProperties(lotteryPrizeVos, prizeVos);
// infoVo.setPrizeVos(prizeVos);
// infoVos.add(infoVo);
// }
QueryWrapper<LotteryInfo> wrapper = new QueryWrapper<LotteryInfo>();
LotteryInfo lotteryInfo = lotteryInfoDao.selectById(vo.getId());
List<LotteryPrize> prizes = lotteryPrizeDao.selectList(new QueryWrapper<LotteryPrize>().eq("lottery_info_id", lotteryInfo.getId()));
LotteryInfoVo lotteryInfoVo = new LotteryInfoVo();
BeanUtil.copyProperties(lotteryInfo, lotteryInfoVo);
lotteryInfoVo.setPrizeVos(prizes);
return lotteryInfoVo;
}
public void updateLotteryInfo(LotteryInfoVo vo) {
// 修改对应的奖品，通过传进来的idlist全部删除礼品表中活动对应的礼品，然后重新添加
List<Integer> idList = vo.getListId();
// 修改lotteryInfo
LotteryInfo lotteryInfo = new LotteryInfo();
BeanUtil.copyProperties(vo, lotteryInfo);
lotteryInfoDao.updateById(lotteryInfo);
System.out.println(idList);
for (Integer prizeId : idList) {
// 删除礼品表中活动对应的礼品
if (new QueryWrapper<LotteryPrize>().eq("lottery_info_id", vo.getId()).eq("prize_type_id", prizeId) != null) {
// 数据库中已存在，且关联该活动的则保留
continue;
} else if (new QueryWrapper<LotteryPrize>().eq("lottery_info_id", vo.getId()).eq("prize_type_id", prizeId) == null) {
// 查出传入vo中存在，但是数据库中不存在的添加
Prize type = prizeDao.selectById(prizeId);
LotteryPrize lotteryPrize = LotteryPrize
.builder()
.lotteryInfoId(vo.getId())
.prizeTypeId(type.getPrizeTypeId())
.prizeName(type.getPrizeName())
.createTime(DateUtil.date())
.build();
lotteryPrizeDao.insert(lotteryPrize);
} else {
// 查出传入vo中不存在，但是数据库中存在的删除
lotteryPrizeDao.delete(new QueryWrapper<LotteryPrize>().eq("lottery_info_id", vo.getId()));
}
}
// lotteryPrizeDao.delete(new QueryWrapper<LotteryPrize>().eq("lottery_info_id", vo.getId()).eq("prize_type_id", prizeId));
// Prize type = prizeDao.selectById(prizeId);
// LotteryPrize lotteryPrize = LotteryPrize
// .builder()
// .lotteryInfoId(vo.getId())
// .prizeTypeId(type.getPrizeTypeId())
// .prizeName(type.getPrizeName())
// .createTime(DateUtil.date())
// .build();
// lotteryPrizeDao.insert(lotteryPrize);
// }
}
}
user-server/src/main/java/com/zq/user/service/LotteryPrizeService.java 0 → 100644
package com.zq.user.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zq.user.entity.LotteryPrize;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
* (LotteryPrize)表服务接口
*
* @author makejava
* @since 2022-08-13 14:49:01
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class LotteryPrizeService {
}
user-server/src/main/java/com/zq/user/service/PrizeService.java
...@@ -38,7 +38,8 @@ import java.util.stream.Collectors; ...@@ -38,7 +38,8 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
@RequiredArgsConstructor @RequiredArgsConstructor
@Service @Service
public class PrizeService { public class
PrizeService {
private final PrizeDao prizeDao; private final PrizeDao prizeDao;
private final LotteryRecDao lotteryRecDao; private final LotteryRecDao lotteryRecDao;
......
user-server/src/main/java/com/zq/user/service/QuestionService.java
...@@ -148,12 +148,10 @@ public class QuestionService { ...@@ -148,12 +148,10 @@ public class QuestionService {
if (CollUtil.isEmpty(answerList)) { if (CollUtil.isEmpty(answerList)) {
correct++; correct++;
} }
} }
// 题数 // 题数
int count = objects.size(); int count = objects.size();
BigDecimal score = BigDecimal.valueOf(100) BigDecimal score = BigDecimal.valueOf(100)
.divide(BigDecimal.valueOf(count), 2, RoundingMode.HALF_UP) .divide(BigDecimal.valueOf(count), 2, RoundingMode.HALF_UP)
.multiply(BigDecimal.valueOf(correct)); .multiply(BigDecimal.valueOf(correct));
...@@ -170,4 +168,6 @@ public class QuestionService { ...@@ -170,4 +168,6 @@ public class QuestionService {
return returnData; return returnData;
} }
} }
user-server/src/main/java/com/zq/user/vo/AnswerRecVo.java 0 → 100644
package com.zq.user.vo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.zq.common.vo.PageReqVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @Author: TangCong
* @Date: 2022-8-13 10:45
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class AnswerRecVo extends PageReqVo {
/**
* 主键
*/
@ApiModelProperty("主键")
private Long id;
/**
* 用户ID
*/
@ApiModelProperty("用户ID")
private String userId;
/**
* 答案数组json字符串
*/
@ApiModelProperty("答案数组json字符串")
private String answerList;
/**
* 创建时间
*/
@ApiModelProperty("创建时间")
private Date createTime;
/**
* 得分
*/
@ApiModelProperty("得分")
private Float score;
}
user-server/src/main/java/com/zq/user/vo/LotteryInfoVo.java 0 → 100644
package com.zq.user.vo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.zq.common.vo.PageReqVo;
import com.zq.user.entity.LotteryPrize;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
import java.util.List;
/**
* @Author: jcm
* @Date: 2022-8-13 14:59
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class LotteryInfoVo extends PageReqVo {
/**
* 自增主键
*/
@ApiModelProperty(value = "自增主键")
private Integer id;
/**
* 抽奖活动名
*/
@ApiModelProperty(value = "抽奖活动名")
private String lotteryInfoName;
/**
* 活动介绍
*/
@ApiModelProperty(value = "活动介绍 ")
private String remark;
/**
* 是否启用该抽奖
*
*/
@ApiModelProperty(value = "是否启用该抽奖 1 启用 2 关闭 ")
private Integer isOpen;
/**
* 开始时间
*/
@ApiModelProperty(value = "开始时间")
private Date startTime;
/**
* 结束时间
*/
@ApiModelProperty(value = "结束时间")
private Date endTime;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**
* 修改时间
*/
@ApiModelProperty(value = "修改时间")
private Date updateTime;
/**
* 本期奖品列表id
*/
@ApiModelProperty(value = "本期奖品列表")
private List<Integer> listId;
/**
* 本期奖品列表
*/
@ApiModelProperty(value = "本期奖品列表")
private List<LotteryPrize> prizeVos;
}
user-server/src/main/java/com/zq/user/vo/LotteryPrizeVo.java 0 → 100644
package com.zq.user.vo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.zq.common.vo.PageReqVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @Author: TangCong
* @Date: 2022-8-13 15:37
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class LotteryPrizeVo extends PageReqVo {
/**
* 自增主键
*/
@ApiModelProperty(value = "自增主键")
@TableId(type = IdType.AUTO)
private Integer id;
/**
* 奖品类型 关联奖品类型(t_prize_type)表id
*/
@ApiModelProperty(value = "奖品类型 关联奖品类型(t_prize_type)表id")
private Integer prizeTypeId;
/**
* 奖品名
*/
@ApiModelProperty(value = "奖品名")
private Integer prizeName;
/**
* 所属抽奖活动 关联奖品类型(t_lottery_info)表id
*/
@ApiModelProperty(value = "所属抽奖活动 关联奖品类型(t_lottery_info)表id")
private Integer lotteryInfoId;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**
* 修改时间
*/
@ApiModelProperty(value = "修改时间")
private Date updateTime;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment