From 1d44c20eabc99e9970fb58d4dbd3a94d77e83e39 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 07 三月 2025 18:35:50 +0800 Subject: [PATCH] 冥想 --- xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientPrizeRedemptionRecordController.java | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientPrizeRedemptionRecordController.java b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientPrizeRedemptionRecordController.java index 40221cc..8038d95 100644 --- a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientPrizeRedemptionRecordController.java +++ b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientPrizeRedemptionRecordController.java @@ -9,6 +9,8 @@ import com.xinquan.common.core.utils.WebUtils; import com.xinquan.common.core.utils.page.CollUtils; import com.xinquan.common.core.utils.page.PageDTO; +import com.xinquan.common.log.annotation.Log; +import com.xinquan.common.log.enums.BusinessType; import com.xinquan.common.security.service.TokenService; import com.xinquan.common.security.utils.SecurityUtils; @@ -75,8 +77,8 @@ String endTime = null; if (org.springframework.util.StringUtils.hasLength(courseDTO.getTime())){ String[] split = courseDTO.getTime().split(" - "); - startTime = split[0]+"00:00:00"; - endTime = split[1]+"23:59:59"; + startTime = split[0]+" 00:00:00"; + endTime = split[1]+" 23:59:59"; } List<Long> longs = new ArrayList<>(); LambdaQueryWrapper<PrizeRedemptionRecord> courseLambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -174,8 +176,8 @@ String endTime = null; if (org.springframework.util.StringUtils.hasLength(courseDTO.getTime())){ String[] split = courseDTO.getTime().split(" - "); - startTime = split[0]+"00:00:00"; - endTime = split[1]+"23:59:59"; + startTime = split[0]+" 00:00:00"; + endTime = split[1]+" 23:59:59"; } List<Long> longs = new ArrayList<>(); LambdaQueryWrapper<PrizeRedemptionRecord> courseLambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -217,6 +219,7 @@ record.setName(byId.getName()); record.setWorth(byId.getWorth()); record.setEnergyValue(byId.getEnergyValue()); + record.setCoverUrl(byId.getCoverUrl()); } record.setUid(record.getId().toString()); AppUser byId1 = appUserService.getById(record.getAppUserId()); @@ -252,6 +255,7 @@ private TokenService tokenService; @GetMapping("/confirm") @ApiOperation(value = "确认兑换", tags = "管理后台-兑换记录管理") + @Log(title = "【奖品管理】确认兑换", businessType = BusinessType.UPDATE) public R updateState(String uid,String code) { LoginUser loginUser = tokenService.getLoginUser(); if (loginUser==null){ @@ -266,6 +270,7 @@ byId.setUpdateTime(LocalDateTime.now()); SysUser data = remoteUserService.getSysUserById(userId + "").getData(); byId.setUpdateBy(data.getUserName()+data.getNickName()+"("+data.getUserName()+")"); + byId.setHandleName(data.getUserName()+data.getNickName()+"("+data.getUserName()+")"); prizeRedemptionRecordService.updateById(byId); } return R.ok(); -- Gitblit v1.7.1