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/UnionStoreApi.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionStoreApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionStoreApi.java
index a6ccd69..8926a05 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionStoreApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionStoreApi.java
@@ -1,7 +1,12 @@
package com.panzhihua.service_equipment.api;
import com.panzhihua.common.model.dtos.equipment.UnionStoreDto;
+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.model.dos.UnionIntegralSummarize;
+import com.panzhihua.service_equipment.service.UnionIntegralSummarizeService;
import com.panzhihua.service_equipment.service.UnionStoreService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -16,19 +21,38 @@
@Resource
private UnionStoreService unionStoreService;
+ @Resource
+ private UnionIntegralSummarizeService unionIntegralSummarizeService;
+
@GetMapping("/getList")
public R getList(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize,
@RequestParam(value = "communityId",required = false) String communityId,
@RequestParam(value = "goodsType",required = false) String goodsType,
- @RequestParam(value = "nameOrNum",required = false) String nameOrNum)
+ @RequestParam(value = "nameOrNum",required = false) String nameOrNum,
+ @CurrentUser UnionUserDto unionUser)
{
+ if(StringUtils.isEmpty(communityId))
+ {
+ R<UnionIntegralSummarize> unionIntegralSummarizeR=
+ unionIntegralSummarizeService.getUserData(unionUser.getId()+"",null);
+ communityId=unionIntegralSummarizeR.getData().getCommunityId();
+ }
return unionStoreService.getList(pageNum,pageSize,communityId,goodsType,nameOrNum);
}
- @PostMapping("/insert")
- public R insert(@RequestBody UnionStoreDto item)
+ @GetMapping("/getData")
+ public R getData(@RequestParam("id") String id)
{
+ return unionStoreService.getData(id);
+ }
+
+
+ @PostMapping("/insert")
+ public R insert(@RequestBody UnionStoreDto item, @CurrentUser UnionUserDto unionUser)
+ {
+ item.setUserId(unionUser.getId()+"");
+ item.setCommunityId(unionUser.getAreaCode()+"");
return unionStoreService.insert(item);
}
--
Gitblit v1.7.1