From a17335c7cddc86ffe70d423e7e6e7456b1d6c93a Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 10 十二月 2024 15:15:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 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..69454cb 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,9 +3,16 @@
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;
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,18 +39,37 @@
@Resource
private UserSignRecordService userSignRecordService;
@Resource
+ private AppUserService appUserService;
+ @Resource
private TokenService tokenService;
+ @Resource
+ private PointSettingClient pointSettingClient;
+ @Resource
+ private SystemConfigClient systemConfigClient;
@ResponseBody
@GetMapping("/sign")
@ApiOperation(value = "签到", tags = {"小程序-签到"})
- public R<AppUser> change(){
+ public R<SignBackRDto> sign(){
Long userId1 = tokenService.getLoginUserApplet().getUserid();
+ AppUser byId = appUserService.getById(userId1);
+ //获取当前用户的会员信息
+ R<PointSetting> pointSetting = pointSettingClient.getPointSetting(byId.getVipId());
UserSignRecord userSignRecord = new UserSignRecord();
userSignRecord.setAppUserId(userId1);
userSignRecord.setCreateTime(LocalDateTime.now());
- userSignRecord.setRedAmount(new BigDecimal(0));
+ if (pointSetting.getData() != null) {
+ userSignRecord.setPoint(pointSetting.getData().getSignPoint());
+ }else {
+ userSignRecord.setPoint(BigDecimal.ZERO);
+ }
+ 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());
+ return R.ok(signBackRDto);
}
}
--
Gitblit v1.7.1