From 0c8277661abbc11ff114483c5e765a7a9d3bbc1a Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 19 八月 2024 11:52:18 +0800
Subject: [PATCH] 8.19
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityController.java | 4 ++--
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java | 1 -
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/PointDetailUtil.java | 28 ++++++++++++++++++++++++++++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java | 9 ++++++---
4 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java
index 7609389..c39f5a1 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java
@@ -55,10 +55,13 @@
}
@ApiOperation(value = "标签删除", tags = {"用户管理-用户标签管理"})
- @PostMapping(value = "/tags/delete/{id}")
- public R delete(@PathVariable Integer id) {
+ @DeleteMapping(value = "/tags/delete")
+ public R delete(@PathVariable String ids) {
//拿到单位列表
- otherClient.deleteTag(id);
+ String[] split = ids.split(",");
+ for (String id : split) {
+ otherClient.deleteTag(Integer.valueOf(id));
+ }
return R.ok();
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/PointDetailUtil.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/PointDetailUtil.java
new file mode 100644
index 0000000..3070952
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/PointDetailUtil.java
@@ -0,0 +1,28 @@
+package com.ruoyi.account.util;
+import java.time.LocalDateTime;
+
+import com.ruoyi.account.api.model.TAppUserIntegralChange;
+import com.ruoyi.account.service.TAppUserIntegralChangeService;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+@Component
+public class PointDetailUtil {
+ @Resource
+ private TAppUserIntegralChangeService appUserIntegralChangeService;
+ public void addDetail(Integer old,Integer now,Integer type,Long userId,String extension,String code){
+
+ TAppUserIntegralChange tAppUserIntegralChange= new TAppUserIntegralChange();
+ tAppUserIntegralChange.setCode(code);
+ tAppUserIntegralChange.setAppUserId(userId);
+ tAppUserIntegralChange.setChangeType(type);
+ tAppUserIntegralChange.setHistoricalIntegral(old);
+ tAppUserIntegralChange.setCurrentIntegral(now);
+ tAppUserIntegralChange.setCreateTime(LocalDateTime.now());
+ tAppUserIntegralChange.setExtension(extension);
+ appUserIntegralChangeService.save(tAppUserIntegralChange);
+
+
+ }
+}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityController.java
index cd4eb1c..140d0d7 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityController.java
@@ -45,11 +45,11 @@
return AjaxResult.success();
}
@GetMapping("/getInfo")
- @ApiOperation(tags = {"管理后台-活动管理"},value = "活动查看详情")
+ @ApiOperation(tags = {"管理后台-活动管理","小程序-个人中心-活动列表"},value = "活动查看详情")
public AjaxResult<TActivity> getInfo(Integer id) {
return AjaxResult.ok(activityService.getById(id));
}
- @ApiOperation(tags = {"管理后台-活动管理"},value = "活动列表分页查询")
+ @ApiOperation(tags = {"管理后台-活动管理","小程序-个人中心-活动列表"},value = "活动列表分页查询")
@PostMapping(value = "/pageList")
public AjaxResult<PageInfo<TActivity>> pageList(@RequestBody AdvertisingDTO dto) {
return AjaxResult.ok(activityService.pageList(dto));
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java
index a1dd7c3..c5e604a 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java
@@ -34,7 +34,6 @@
.like(unitListQueryDto.getCompanyName() != null && unitListQueryDto.getCompanyName().isEmpty(), TCompany::getName, unitListQueryDto.getCompanyName())
.page(Page.of(unitListQueryDto.getPageCurr(), unitListQueryDto.getPageSize()));
return R.ok(page);
-
}
//单位添加
--
Gitblit v1.7.1