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 | 98 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 95 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 cff28d8..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 @@ -1,11 +1,23 @@ package com.ruoyi.account.controller; +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; import com.ruoyi.common.security.service.TokenService; +import com.ruoyi.other.api.domain.PointSetting; +import com.ruoyi.other.api.domain.VipSetting; +import com.ruoyi.other.api.feignClient.PointSettingClient; +import com.ruoyi.other.api.feignClient.SystemConfigClient; +import com.ruoyi.other.api.feignClient.VipGoodClient; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.GetMapping; @@ -32,17 +44,97 @@ @Resource private UserSignRecordService userSignRecordService; @Resource + private AppUserService appUserService; + @Resource private TokenService tokenService; + @Resource + private PointSettingClient pointSettingClient; + @Resource + private SystemConfigClient systemConfigClient; + + @Resource + private UserPointService userPointService; + @Resource + private BalanceChangeRecordService balanceChangeRecordService; + + + + + @ResponseBody @GetMapping("/sign") @ApiOperation(value = "签到", tags = {"小程序-签到"}) - public R<AppUser> change(){ + public R<SignBackRDto> sign(){ Long userId1 = tokenService.getLoginUserApplet().getUserid(); + UserSignRecord one = userSignRecordService.getOne(new LambdaQueryWrapper<UserSignRecord>().eq(UserSignRecord::getAppUserId, userId1) + .eq(UserSignRecord::getDelFlag, 0).last(" and DATE_FORMAT(NOW(), '%Y-%m-%d') = DATE_FORMAT(create_time, '%Y-%m-%d')")); + if(null != one){ + return R.fail("今天已经签过到了"); + } + AppUser appUser = appUserService.getById(userId1); + //获取当前用户的会员信息 + PointSetting pointSetting = pointSettingClient.getPointSetting(appUser.getVipId()).getData(); UserSignRecord userSignRecord = new UserSignRecord(); userSignRecord.setAppUserId(userId1); userSignRecord.setCreateTime(LocalDateTime.now()); - userSignRecord.setRedAmount(new BigDecimal(0)); - userSignRecord.setSignDay(LocalDate.now()); + if (pointSetting != null) { + userSignRecord.setPoint(pointSetting.getSignPoint()); + int signPoint = pointSetting.getSignPoint(); + if(signPoint > 0){ + int signPoint1 = 0; + if(1 == pointSetting.getWorkPointOpen()){ + signPoint1 = new BigDecimal(signPoint).multiply(pointSetting.getWorkPoint().divide(new BigDecimal(100))).intValue(); + } + Integer lavePoint = appUser.getLavePoint(); + appUser.setTotalPoint(appUser.getTotalPoint() + signPoint); + appUser.setLavePoint(appUser.getLavePoint() + signPoint); + appUser.setAvailablePoint(appUser.getAvailablePoint() + signPoint1); + appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() + signPoint1); + if(null != pointSetting && 1 == pointSetting.getWorkPointGift()){ + appUser.setTransferablePoint(appUser.getTransferablePoint() + signPoint1); + } + appUser.setTotalSignPoint(appUser.getTotalSignPoint() + signPoint); + appUserService.updateById(appUser); + + //添加积分变动记录 + UserPoint userPoint = new UserPoint(); + userPoint.setType(5); + userPoint.setVariablePoint(signPoint); + 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); + } + } return R.ok(); } -- Gitblit v1.7.1