From f9d2eaaa5939b05826a90803fc320eafd5408b03 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 17 十一月 2023 18:21:26 +0800
Subject: [PATCH] 商城 商品 兑换地址模块2
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java | 116 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 98 insertions(+), 18 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
index 27f61ae..ec7e95a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
@@ -5,6 +5,8 @@
import com.panzhihua.common.model.dtos.partybuilding.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
+import com.panzhihua.common.model.vos.community.building.NewFightConvenientMerchantVO;
+import com.panzhihua.common.model.vos.community.building.NewFightShoppingVO;
import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
@@ -71,9 +73,10 @@
@RequestParam(value = "search", required = false)String search,
@RequestParam(value = "status", required = false)String status,
@RequestParam(value = "kind", required = false)String kind,
- @RequestParam(value = "userId", required = false)String userId)
+ @RequestParam(value = "userId", required = false)String userId,
+ @RequestParam(value = "communityId", required = false)String communityId)
{
- return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,status,kind,userId,getUserId()+"",getCommunityId()+"");
+ return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,status,kind,userId,getUserId()+"",communityId);
}
@@ -135,9 +138,11 @@
@ApiOperation(value = "任务报名详情", response = NeedProblemClaimDTO.class)
@GetMapping("/getNeedClaimDetails")
- public R getNeedClaimDetails(@RequestParam("id") String id)
+ public R getNeedClaimDetails(@RequestParam(value = "id", required = false) String id,
+ @RequestParam(value = "taskId", required = false) String taskId,
+ @RequestParam(value = "userId", required = false) String userId)
{
- return newStriveForFeign.getNeedClaimDetails(id);
+ return newStriveForFeign.getNeedClaimDetails(id,taskId,userId);
}
@ApiOperation(value = "任务报名")
@@ -156,9 +161,11 @@
@ApiOperation(value = "取消报名")
@DeleteMapping("/expurgateNeedClaimData")
- public R expurgateNeedClaimData(@RequestParam("id") String id)
+ public R expurgateNeedClaimData(@RequestParam(value = "id", required = false) String id,
+ @RequestParam(value = "taskId", required = false) String taskId,
+ @RequestParam(value = "userId", required = false) String userId)
{
- return newStriveForFeign.expurgateNeedClaimData(id);
+ return newStriveForFeign.expurgateNeedClaimData(id,taskId,userId);
}
@@ -227,14 +234,14 @@
@RequestParam("pageSize") int pageSize)
{
return newStriveForFeign.getNewFightCommunityList(pageNum,pageSize,
- getCommunityId()+"",getUserId()+"");
+ getCommunityId()+"",null);
}
- @ApiOperation(value = "社区共建项目删除", response = NewFightCommunityConstructionDTO.class)
+ @ApiOperation(value = "社区共建项目详情", response = NewFightCommunityConstructionDTO.class)
@GetMapping("/getNewFightCommunityDetails")
public R getNewFightCommunityDetails(@RequestParam("id") String id)
{
- return newStriveForFeign.getNewFightCommunityDetails(id);
+ return newStriveForFeign.getNewFightCommunityDetails(id,getUserId()+"");
}
@ApiOperation(value = "社区共建项目添加")
@@ -253,7 +260,7 @@
@ApiOperation(value = "社区共建项目删除")
@DeleteMapping("/expurgateNewFightCommunityData")
- public R expurgateNewFightCommunityData(@RequestParam("id") String id)
+ public R expurgateNewFightCommunityData(@RequestParam(value = "id", required = false) String id)
{
return newStriveForFeign.expurgateNewFightCommunityData(id);
}
@@ -299,11 +306,7 @@
@PostMapping("/editProjectPlanAccomplish")
public R editProjectPlanAccomplish(@RequestParam("id") String id)
{
- NewFightProjectPlanDTO item =new NewFightProjectPlanDTO();
- item.setId(id);
- item.setAffirmTime(new Date());
- item.setAccomplish("1");
- return newStriveForFeign.editProjectPlanData(item);
+ return newStriveForFeign.editProjectPlanAccomplish(id);
}
@@ -353,9 +356,11 @@
@ApiOperation(value = "项目参与人员取消报名")
@DeleteMapping("/expurgateJoinData")
- public R expurgateJoinData(@RequestParam("id") String id)
+ public R expurgateJoinData(@RequestParam(value = "id", required = false) String id,
+ @RequestParam(value = "projectId", required = false) String projectId,
+ @RequestParam(value = "userId", required = false) String userId)
{
- return newStriveForFeign.expurgateJoinData(id);
+ return newStriveForFeign.expurgateJoinData(id,projectId,userId);
}
@@ -405,7 +410,7 @@
/*******************************************************************************************************************
*
- *
+ * 微心愿app
*
* ****************************************************************************************************************/
@@ -522,7 +527,82 @@
}
+ /************************************************************************************************************
+ *
+ * 资源共享
+ *
+ *************************************************************************************************************/
+
+ @ApiOperation(value = "资源共享列表", response = NewFightResourceSharingDTO.class)
+ @GetMapping("/getResourceSharingList")
+ public R getResourceSharingList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "communityId", required = false)String communityId)
+ {
+ return newStriveForFeign.getResourceSharingList(pageNum,pageSize,communityId,null);
+ }
+
+ @ApiOperation(value = "资源共享详情", response = NewFightResourceSharingDTO.class)
+ @GetMapping("/getResourceSharingDetails")
+ public R getResourceSharingDetails(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.getResourceSharingDetails(id);
+ }
+ /*******************************************************************************************************
+ *
+ * 积分商城
+ *
+ *******************************************************************************************************/
+ @ApiOperation(value = "积分商品列表", response = NewFightShoppingVO.class)
+ @GetMapping("/getFightShoppingList")
+ public R getFightShoppingList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageNum") int pageSize,
+ @RequestParam(value = "goodName", required = false)String goodName,
+ @RequestParam(value = "goodType", required = false)String goodType,
+ @RequestParam(value = "id", required = false)String id)
+ {
+ return newStriveForFeign.getFightShoppingList(pageNum,pageSize,getCommunityId()+"",
+ goodName,goodType,id);
+ }
+
+
+ @ApiOperation(value = "积分商品详情", response = NewFightShoppingVO.class)
+ @GetMapping("/getFightShoppingDetails")
+ public R getFightShoppingDetails(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.getFightShoppingDetails(id);
+ }
+
+
+ /*******************************************************************************************************
+ *
+ * 商家模块
+ *
+ * ********************************************************************************************************/
+
+ @ApiOperation(value = "商家列表", response = NewFightConvenientMerchantVO.class)
+ @GetMapping("/pageMerchant")
+ public R pageMerchant(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "keyword", required = false)String keyword)
+ {
+ return newStriveForFeign.pageMerchant(pageNum,pageSize,getCommunityId()+"","0",
+ keyword,"1");
+ }
+
+ /**
+ * 查询商家信息
+ *
+ * @param merchantId
+ * @return
+ */
+ @ApiOperation(value = "商家详情", response = NewFightConvenientMerchantVO.class)
+ @GetMapping("/selectMerchantById")
+ public R selectMerchantById(@RequestParam("merchantId") String merchantId)
+ {
+ return newStriveForFeign.selectMerchantById(merchantId);
+ }
}
--
Gitblit v1.7.1