From a981c07d34edd0975b9d556d97c1f851ce79974c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 04 十二月 2024 13:40:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java | 68 ++++++++++++++++++++++++++++++++-
1 files changed, 65 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java
index bf24222..780c330 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java
@@ -1,8 +1,23 @@
package com.ruoyi.account.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.account.api.model.UserPoint;
+import com.ruoyi.account.service.UserPointService;
+import com.ruoyi.account.vo.UserPointDetailVO;
+import com.ruoyi.account.vo.UserPointVO;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -14,7 +29,54 @@
*/
@RestController
@RequestMapping("/user-point")
-public class UserPointController {
+@Api(tags = "个人积分")
+public class UserPointController extends BaseController {
+ @Resource
+ private UserPointService userPointService;
+
+ /**
+ * 获取个人积分
+ */
+ @GetMapping("/getUserPoint")
+ @ApiOperation("获取个人积分")
+ public R<UserPointVO> getUserPoint(){
+ return R.ok(userPointService.getUserPoint(SecurityUtils.getUserId()));
+ }
+
+ /**
+ * 获取变更明细
+ */
+ @GetMapping("/getUserPointDetail")
+ @ApiOperation("获取变更明细")
+ public TableDataInfo getUserPointDetail(@ApiParam("指定日期") LocalDateTime date,
+ @ApiParam("变动类型（1=消费积分，2=返佣积分，3=拉新人积分，4=兑换商品 " +
+ "5 = 门店业绩积分 6 =门店返佣积分7=技师业绩积分8 =转赠积分 9 =做工积分 " +
+ "10 =注册积分）") Integer type){
+ startPage();
+ List<UserPointDetailVO> list = userPointService.getUserPointDetail(SecurityUtils.getUserId(), date, type);
+ return getDataTable(list);
+ }
+
+ /**
+ * 转赠积分
+ */
+ @PostMapping("/transferPoint")
+ @ApiOperation("转赠积分")
+ public R<Void> transferPoint(@ApiParam("积分") BigDecimal point, @ApiParam("手机号") Long phone){
+ return R.ok();
+ }
+
+
+ /**
+ * 保存积分流水记录
+ * @param userPoint
+ * @return
+ */
+ @PostMapping("/saveUserPoint")
+ public R saveUserPoint(@RequestBody UserPoint userPoint){
+ userPointService.save(userPoint);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1