From ce4a770744d7a0b4e4ea3b5101556b94e72bdf1c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 14 十一月 2023 17:49:20 +0800
Subject: [PATCH] 修改打卡
---
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionExchangeRecordApi.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionExchangeRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionExchangeRecordApi.java
index fb6264c..e276d8b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionExchangeRecordApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionExchangeRecordApi.java
@@ -1,10 +1,11 @@
package com.panzhihua.service_equipment.api;
import com.panzhihua.common.model.dtos.equipment.UnionExchangeRecordDto;
-import com.panzhihua.common.model.dtos.equipment.UnionIntegralRecordDto;
+import com.panzhihua.common.model.dtos.equipment.UnionUserDto;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.service_equipment.annotation.CurrentUser;
import com.panzhihua.service_equipment.service.UnionExchangeRecordService;
-import com.panzhihua.service_equipment.service.UnionIntegralRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -22,9 +23,14 @@
public R unionExchangeRecordGetList(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize,
@RequestParam(value = "communityId",required = false) String communityId,
- @RequestParam(value = "integralTyppe",required = false) String userId)
+ @RequestParam(value = "orderType",required = false) String orderType,
+ @CurrentUser UnionUserDto unionUser)
{
- return unionStoreService.getList(pageNum,pageSize,communityId,userId);
+ if(StringUtils.equals("0",orderType))
+ {
+ orderType=null;
+ }
+ return unionStoreService.getList(pageNum,pageSize,communityId,unionUser.getId()+"",orderType);
}
@@ -35,13 +41,14 @@
}
@PostMapping("/insert")
- public R unionExchangeRecordInsert(@RequestBody UnionExchangeRecordDto item)
+ public R unionExchangeRecordInsert(@RequestBody UnionExchangeRecordDto item, @CurrentUser UnionUserDto unionUser)
{
+ item.setUserId(unionUser.getId()+"");
return unionStoreService.insert(item);
}
@PostMapping("/update")
- public R unionExchangeRecordUpdate(@RequestBody UnionExchangeRecordDto item)
+ public R unionExchangeRecordUpdate(@RequestBody UnionExchangeRecordDto item,@CurrentUser UnionUserDto unionUser)
{
return unionStoreService.update(item);
}
--
Gitblit v1.7.1