From b9c45c78310131c34eb7d08e539cf13658b6c15f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 25 九月 2023 09:15:20 +0800
Subject: [PATCH] 新增兑换记录 取货方式字段
---
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionStoreApi.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 58c93fa..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
@@ -3,7 +3,10 @@
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.*;
@@ -18,13 +21,23 @@
@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);
}
--
Gitblit v1.7.1