From a8d2cb07f6440dc54dc4005b0b06d5a47cb1517d Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期一, 16 十二月 2024 13:34:03 +0800 Subject: [PATCH] 12.16 --- ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java index 2724641..e0f26c8 100644 --- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java +++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java @@ -3,6 +3,7 @@ import com.ruoyi.account.api.model.AppUser; import com.ruoyi.account.api.model.UserSignRecord; +import com.ruoyi.account.dto.SignBackRDto; import com.ruoyi.account.service.AppUserService; import com.ruoyi.account.service.UserSignRecordService; import com.ruoyi.common.core.domain.R; @@ -48,7 +49,7 @@ @ResponseBody @GetMapping("/sign") @ApiOperation(value = "签到", tags = {"小程序-签到"}) - public R<AppUser> sign(){ + public R<SignBackRDto> sign(){ Long userId1 = tokenService.getLoginUserApplet().getUserid(); AppUser byId = appUserService.getById(userId1); //获取当前用户的会员信息 @@ -59,12 +60,17 @@ if (pointSetting.getData() != null) { userSignRecord.setPoint(pointSetting.getData().getSignPoint()); }else { - userSignRecord.setPoint(BigDecimal.ZERO); + userSignRecord.setPoint(0); } R<BigDecimal> bigDecimalR = systemConfigClient.redPackegeSet(); userSignRecord.setRedAmount(bigDecimalR.getData()); userSignRecord.setSignDay(LocalDate.now()); - return R.ok(); + + SignBackRDto signBackRDto = new SignBackRDto(); + signBackRDto.setPoint(userSignRecord.getPoint()); + signBackRDto.setRedAmount(userSignRecord.getRedAmount()); + userSignRecordService.save(userSignRecord); + return R.ok(signBackRDto); } } -- Gitblit v1.7.1