From fd7b8fb7c89832c28a838b0449bbb8a392433ee2 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期二, 22 四月 2025 14:33:02 +0800 Subject: [PATCH] 将华为云短信替换成阿里云短信 --- ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java | 51 +++++++++++++++++++++++++++++++++------------------ 1 files changed, 33 insertions(+), 18 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 827270a..91a92ef 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,10 +3,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ruoyi.account.api.model.AppUser; +import com.ruoyi.account.api.model.BalanceChangeRecord; import com.ruoyi.account.api.model.UserPoint; import com.ruoyi.account.api.model.UserSignRecord; import com.ruoyi.account.dto.SignBackRDto; import com.ruoyi.account.service.AppUserService; +import com.ruoyi.account.service.BalanceChangeRecordService; import com.ruoyi.account.service.UserPointService; import com.ruoyi.account.service.UserSignRecordService; import com.ruoyi.common.core.domain.R; @@ -52,6 +54,8 @@ @Resource private UserPointService userPointService; + @Resource + private BalanceChangeRecordService balanceChangeRecordService; @@ -83,7 +87,6 @@ } Integer lavePoint = appUser.getLavePoint(); appUser.setTotalPoint(appUser.getTotalPoint() + signPoint); - appUser.setTotalSignPoint(appUser.getTotalSignPoint() + signPoint); appUser.setLavePoint(appUser.getLavePoint() + signPoint); appUser.setAvailablePoint(appUser.getAvailablePoint() + signPoint1); appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() + signPoint1); @@ -96,31 +99,43 @@ //添加积分变动记录 UserPoint userPoint = new UserPoint(); userPoint.setType(5); - userPoint.setHistoricalPoint(lavePoint); userPoint.setVariablePoint(signPoint); - userPoint.setBalance(appUser.getLavePoint()); userPoint.setCreateTime(LocalDateTime.now()); userPoint.setAppUserId(appUser.getId()); + userPoint.setChangeDirection(1); userPointService.save(userPoint); //变更等级 appUserService.vipUpgrade(appUser.getId()); + + R<BigDecimal> bigDecimalR = systemConfigClient.redPackegeSet(); + BigDecimal data = bigDecimalR.getData(); + if(data.compareTo(BigDecimal.ZERO) > 0){ + userSignRecord.setRedAmount(data); + userSignRecord.setSignDay(LocalDate.now()); + BigDecimal sum = appUser.getTotalRedPacketAmount().add(bigDecimalR.getData()); + appUser.setTotalRedPacketAmount(sum); + BigDecimal sum2 = appUser.getBalance().add(bigDecimalR.getData()); + appUser.setBalance(sum2); + appUserService.updateById(appUser); + // 增加一条余额明细 + BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord(); + balanceChangeRecord.setAppUserId(appUser.getId()); + balanceChangeRecord.setVipId(appUser.getVipId()); + balanceChangeRecord.setChangeType(3); + balanceChangeRecord.setChangeAmount(bigDecimalR.getData()); + balanceChangeRecord.setDelFlag(0); + balanceChangeRecord.setCreateTime(LocalDateTime.now()); + balanceChangeRecord.setChangeDirection(1); + balanceChangeRecordService.save(balanceChangeRecord); + } + userSignRecordService.save(userSignRecord); + SignBackRDto signBackRDto = new SignBackRDto(); + signBackRDto.setPoint(userSignRecord.getPoint()); + signBackRDto.setRedAmount(userSignRecord.getRedAmount()); + return R.ok(signBackRDto); } - }else { - userSignRecord.setPoint(0); } - R<BigDecimal> bigDecimalR = systemConfigClient.redPackegeSet(); - userSignRecord.setRedAmount(bigDecimalR.getData()); - userSignRecord.setSignDay(LocalDate.now()); - BigDecimal sum = appUser.getTotalRedPacketAmount().add(bigDecimalR.getData()); - appUser.setTotalRedPacketAmount(sum); - BigDecimal sum2 = appUser.getBalance().add(bigDecimalR.getData()); - appUser.setBalance(sum2); - appUserService.updateById(appUser); - SignBackRDto signBackRDto = new SignBackRDto(); - signBackRDto.setPoint(userSignRecord.getPoint()); - signBackRDto.setRedAmount(userSignRecord.getRedAmount()); - userSignRecordService.save(userSignRecord); - return R.ok(signBackRDto); + return R.ok(); } } -- Gitblit v1.7.1