java/qijisheng.git

			@@ -191,17 +191,16 @@
			@GetMapping("/list")
			@ApiOperation(value = "订单优惠活动-获取活动列表", tags = {"管理后台-活动管理"})
			public R<Page<OrderActivityInfo>> list(@ApiParam("页码") @RequestParam Integer pageNum,
			@ApiParam("每一页数据大小") Integer pageSize,
			OrderActivityInfo orderActivityInfo){
			@ApiParam("每一页数据大小") Integer pageSize, String id, String activityName, Integer status, Integer isShelf){

			Page<OrderActivityInfo> page = orderActivityInfoService.page(Page.of(pageNum, pageSize), new LambdaQueryWrapper<OrderActivityInfo>()
			.like(orderActivityInfo.getId() != null, OrderActivityInfo::getId, orderActivityInfo.getId())
			.like(StringUtils.isNotEmpty(orderActivityInfo.getActivityName()), OrderActivityInfo::getActivityName, orderActivityInfo.getActivityName())
			.gt(orderActivityInfo.getStatus() != null && orderActivityInfo.getStatus() == 0, OrderActivityInfo::getStartTime, LocalDateTime.now())
			.ge(orderActivityInfo.getStatus() != null && orderActivityInfo.getStatus() == 1, OrderActivityInfo::getEndTime, LocalDateTime.now())
			.lt(orderActivityInfo.getStatus() != null && orderActivityInfo.getStatus() == 1, OrderActivityInfo::getStartTime, LocalDateTime.now())
			.lt(orderActivityInfo.getStatus() != null && orderActivityInfo.getStatus() == 2, OrderActivityInfo::getEndTime, LocalDateTime.now())
			.eq(orderActivityInfo.getIsShelf() != null, OrderActivityInfo::getIsShelf, orderActivityInfo.getIsShelf()).orderByDesc(OrderActivityInfo::getCreateTime)
			.like(StringUtils.isNotEmpty(id), OrderActivityInfo::getId, id)
			.like(StringUtils.isNotEmpty(activityName), OrderActivityInfo::getActivityName, activityName)
			.gt(status != null && status == 0, OrderActivityInfo::getStartTime, LocalDateTime.now())
			.ge(status != null && status == 1, OrderActivityInfo::getEndTime, LocalDateTime.now())
			.lt(status != null && status == 1, OrderActivityInfo::getStartTime, LocalDateTime.now())
			.lt(status != null && status == 2, OrderActivityInfo::getEndTime, LocalDateTime.now())
			.eq(isShelf != null, OrderActivityInfo::getIsShelf, isShelf).orderByDesc(OrderActivityInfo::getCreateTime)
			.orderByDesc(OrderActivityInfo::getCreateTime))
			;
			page.getRecords().forEach(item -> {

	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -445,6 +445,7 @@
			* @return 结果
			*/
			@Override
			@Transactional(rollbackFor = Exception.class)
			public int deleteUserByIds(Long[] userIds) {
			Long userid = tokenService.getLoginUser().getUserid();
			SysUser sysUser = this.getById(userid);