From 0a40e403f712958830f4be47bc5e13773d429150 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 20 九月 2023 17:36:55 +0800
Subject: [PATCH] 新增兑换记录流程 收货地址流程
---
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionIntegralSummarizeApi.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionIntegralSummarizeApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionIntegralSummarizeApi.java
index 180de85..8a71d80 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionIntegralSummarizeApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionIntegralSummarizeApi.java
@@ -1,9 +1,9 @@
package com.panzhihua.service_equipment.api;
-import com.panzhihua.common.model.dtos.equipment.UnionIntegralRecordDto;
import com.panzhihua.common.model.dtos.equipment.UnionIntegralSummarizeDto;
+import com.panzhihua.common.model.dtos.equipment.UnionUserDto;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.service_equipment.service.UnionIntegralRecordService;
+import com.panzhihua.service_equipment.annotation.CurrentUser;
import com.panzhihua.service_equipment.service.UnionIntegralSummarizeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -21,10 +21,9 @@
@GetMapping("/getList")
public R unionIntegralSummarizeGetList(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize,
- @RequestParam("userId") String userId,
- @RequestParam(value = "communityId",required = false) String communityId)
+ @RequestParam(value = "communityId",required = false) String communityId,@CurrentUser UnionUserDto unionUser)
{
- return unionStoreService.getList(pageNum,pageSize,communityId,userId);
+ return unionStoreService.getList(pageNum,pageSize,communityId,unionUser.getId()+"");
}
@@ -34,9 +33,16 @@
return unionStoreService.getData(id);
}
+
+ @GetMapping("/getUserData")
+ public R unionIntegralSummarizeGetUserData(@CurrentUser UnionUserDto unionUser) {
+ return unionStoreService.getUserData(unionUser.getId()+"",null);
+ }
+
@PostMapping("/insert")
- public R unionIntegralSummarizeInsert(@RequestBody UnionIntegralSummarizeDto item)
+ public R unionIntegralSummarizeInsert(@RequestBody UnionIntegralSummarizeDto item, @CurrentUser UnionUserDto unionUser)
{
+ item.setUserId(unionUser.getId()+"");
return unionStoreService.insert(item);
}
--
Gitblit v1.7.1