From d37ac1b495dd070e37209527bbedc1ce0730951a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 01 一月 2025 15:16:41 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 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 69454cb..2b2891c 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
@@ -2,9 +2,11 @@
import com.ruoyi.account.api.model.AppUser;
+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.UserPointService;
import com.ruoyi.account.service.UserSignRecordService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.service.TokenService;
@@ -46,21 +48,57 @@
private PointSettingClient pointSettingClient;
@Resource
private SystemConfigClient systemConfigClient;
+
+ @Resource
+ private UserPointService userPointService;
+
+
+
+
+
@ResponseBody
@GetMapping("/sign")
@ApiOperation(value = "签到", tags = {"小程序-签到"})
public R<SignBackRDto> sign(){
Long userId1 = tokenService.getLoginUserApplet().getUserid();
- AppUser byId = appUserService.getById(userId1);
+ AppUser appUser = appUserService.getById(userId1);
//获取当前用户的会员信息
- R<PointSetting> pointSetting = pointSettingClient.getPointSetting(byId.getVipId());
+ PointSetting pointSetting = pointSettingClient.getPointSetting(appUser.getVipId()).getData();
UserSignRecord userSignRecord = new UserSignRecord();
userSignRecord.setAppUserId(userId1);
userSignRecord.setCreateTime(LocalDateTime.now());
- if (pointSetting.getData() != null) {
- userSignRecord.setPoint(pointSetting.getData().getSignPoint());
+ 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);
+ 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.setHistoricalPoint(lavePoint);
+ userPoint.setVariablePoint(signPoint);
+ userPoint.setBalance(appUser.getLavePoint());
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPoint.setAppUserId(appUser.getId());
+ userPointService.save(userPoint);
+ //变更等级
+ appUserService.vipUpgrade(appUser.getId());
+ }
}else {
- userSignRecord.setPoint(BigDecimal.ZERO);
+ userSignRecord.setPoint(0);
}
R<BigDecimal> bigDecimalR = systemConfigClient.redPackegeSet();
userSignRecord.setRedAmount(bigDecimalR.getData());
@@ -69,6 +107,7 @@
SignBackRDto signBackRDto = new SignBackRDto();
signBackRDto.setPoint(userSignRecord.getPoint());
signBackRDto.setRedAmount(userSignRecord.getRedAmount());
+ userSignRecordService.save(userSignRecord);
return R.ok(signBackRDto);
}
--
Gitblit v1.7.1