From 96769927d1d5ab9d90db78e013562804fce6711a Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 29 三月 2024 13:51:23 +0800
Subject: [PATCH] 心愿详情页面接口报错
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java | 214 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 210 insertions(+), 4 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 ec7e95a..a24936f 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,10 +5,14 @@
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.IntegratingTaskVO;
import com.panzhihua.common.model.vos.community.building.NewFightConvenientMerchantVO;
+import com.panzhihua.common.model.vos.community.building.NewFightShoppingOrderVO;
import com.panzhihua.common.model.vos.community.building.NewFightShoppingVO;
+import com.panzhihua.common.model.vos.jinhui.JinhuiShoppingOrderVO;
import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
+import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.partybuilding.NewStriveForFeign;
import com.panzhihua.common.service.user.UserService;
@@ -71,12 +75,13 @@
public R getNeedProblemList(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize,
@RequestParam(value = "search", required = false)String search,
+ @RequestParam(value = "classifyId", required = false)String classifyId,
@RequestParam(value = "status", required = false)String status,
@RequestParam(value = "kind", required = false)String kind,
@RequestParam(value = "userId", required = false)String userId,
@RequestParam(value = "communityId", required = false)String communityId)
{
- return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,status,kind,userId,getUserId()+"",communityId);
+ return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,classifyId,status,kind,userId,getUserId()+"",communityId);
}
@@ -537,9 +542,11 @@
@GetMapping("/getResourceSharingList")
public R getResourceSharingList(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize,
- @RequestParam(value = "communityId", required = false)String communityId)
+ @RequestParam(value = "communityId", required = false)String communityId,
+ @RequestParam(value = "unitId", required = false)String unitId,
+ @RequestParam(value = "meritId", required = false) String meritId)
{
- return newStriveForFeign.getResourceSharingList(pageNum,pageSize,communityId,null);
+ return newStriveForFeign.getResourceSharingList(pageNum,pageSize,communityId,unitId,meritId);
}
@ApiOperation(value = "资源共享详情", response = NewFightResourceSharingDTO.class)
@@ -558,7 +565,7 @@
@ApiOperation(value = "积分商品列表", response = NewFightShoppingVO.class)
@GetMapping("/getFightShoppingList")
public R getFightShoppingList(@RequestParam("pageNum") int pageNum,
- @RequestParam("pageNum") int pageSize,
+ @RequestParam("pageSize") int pageSize,
@RequestParam(value = "goodName", required = false)String goodName,
@RequestParam(value = "goodType", required = false)String goodType,
@RequestParam(value = "id", required = false)String id)
@@ -605,4 +612,203 @@
return newStriveForFeign.selectMerchantById(merchantId);
}
+
+
+ /*****************************************************************************************************
+ *
+ * 用户积分任务完成情况
+ *
+ *******************************************************************************************************/
+ /**
+ * 列表
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "用户积分任务列表", response = IntegratingTaskVO.class)
+ @GetMapping("/getTaskList")
+ public R getIntegratingTaskList()
+ {
+ return newStriveForFeign.getIntegratingTaskList(getUserId()+"",
+ getCommunityId()+"");
+ }
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "用户积分任务去完成 只传 status ")
+ @PostMapping("/addIntegratingTaskData")
+ public R addIntegratingTaskData(@RequestBody IntegratingTaskVO item)
+ {
+ item.setIsDraw("1");
+ item.setUserId(getUserId()+"");
+ item.setCommunityId(getCommunityId()+"");
+ return newStriveForFeign.addIntegratingTaskData(item);
+ }
+
+
+ /**
+ * 每日签到记录列表 前15条
+ * @return
+ */
+ @ApiOperation(value = "每日签到记录列表 前15条", response = IntegratingTaskVO.class)
+ @GetMapping("/IntegratingTask/getEverydayList")
+ public R getEverydayList()
+ {
+ return newStriveForFeign.getEverydayList(getUserId()+"",getCommunityId()+"");
+ }
+
+
+
+ /**
+ * 添加或者修改积分
+ * @param item
+ * @return
+ */
+ @ApiOperation(value = "用户领取积分")
+ @PostMapping("/IntegratingTask/upIntegral")
+ public R upIntegral(@RequestBody NewFightIntegral item)
+ {
+ return newStriveForFeign.upIntegral(item);
+ }
+
+
+ /*******************************************************************************************************************
+ *
+ * 商品订单
+ *
+ ****************************************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "订单列表", response = NewFightShoppingOrderVO.class)
+ @GetMapping("/orderGetList")
+ public R orderGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "userId", required = false)String userId,
+ @RequestParam(value = "goodsId", required = false)String goodsId,
+ @RequestParam(value = "orderNumber", required = false)String orderNumber,
+ @RequestParam(value = "goodName", required = false)String goodName,
+ @RequestParam(value = "name", required = false)String name,
+ @RequestParam(value = "cancelType", required = false)String cancelType,
+ @RequestParam(value = "merchantId", required = false) String merchantId,
+ @RequestParam(value = "orderType", required = false) String orderType)
+ {
+ return newStriveForFeign.orderGetList(pageNum,pageSize,userId,goodsId,orderNumber,
+ goodName,name,cancelType,getCommunityId()+"",merchantId,orderType);
+ }
+
+ /**
+ * 分页详情
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "订单详情", response = NewFightShoppingOrderVO.class)
+ @GetMapping("/orderGetDetails")
+ public R orderGetDetails(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.orderGetDetails(id,getCommunityId()+"");
+ }
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "订单添加")
+ @PostMapping("/orderAddData")
+ public R orderAddData(@RequestBody NewFightShoppingOrderVO item)
+ {
+// item.setCommunityId(getCommunityId()+"");
+// item.setUserId(getUserId()+"");
+// item.setOrderType("1");
+ return newStriveForFeign.orderAddData(item);
+ }
+
+
+ /**
+ * 编辑
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "订单编辑", response = NewFightShoppingOrderVO.class)
+ @PostMapping("/NewFightOrder/orderEditData")
+ public R orderEditData(@RequestBody NewFightShoppingOrderVO item)
+ {
+ return newStriveForFeign.orderEditData(item);
+ }
+
+
+ /**
+ * 取消
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "订单取消")
+ @GetMapping("/orderCancelOrder")
+ public R orderCancelOrder(@RequestParam("orderId") String orderId)
+ {
+ return newStriveForFeign.orderCancelOrder(orderId,getCommunityId()+"");
+ }
+
+
+ /**
+ * 删除
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "订单删除")
+ @DeleteMapping("/orderExpurgateData")
+ public R orderExpurgateData(@RequestParam("id") String id)
+ {
+ return newStriveForFeign.orderExpurgateData(id,getCommunityId()+"");
+ }
+
+
+ @ApiOperation(value = "订单核销")
+ @GetMapping("/orderCheck")
+ public R orderEditData(@RequestParam("id") String id)
+ {
+
+ if(org.apache.commons.lang3.StringUtils.isEmpty(id))
+ {
+ return R.fail("订单id不能为空");
+ }
+
+ NewFightShoppingOrderVO vo=new NewFightShoppingOrderVO();
+ vo.setId(id);
+ vo.setCancelType("1");
+ vo.setCancelTime(new Date());
+ return newStriveForFeign.orderEditData(vo);
+ }
+
+
+ @ApiOperation(value = "获取社区积分排名")
+ @GetMapping("/getIntegralUserRank")
+ public R getIntegralUserRank()
+ {
+ return communityService.getIntegralUserRank(getCommunityId(),getUserId());
+ }
+
+
+ @ApiOperation(value = "是否是商家 如果是商家返回商家id")
+ @GetMapping("/selectUserBind")
+ public R selectUserBind()
+ {
+ return newStriveForFeign.selectUserBind(getCommunityId()+"",getUserId()+"");
+ }
+
+
+
+ @ApiOperation(value = "搜索用户", response = SysUserVO.class)
+ @GetMapping("/selectUserList")
+ public R selectUserList(@RequestParam("phoneOrname") String phoneOrname)
+ {
+ return newStriveForFeign.selectUserList(getCommunityId()+"",phoneOrname);
+ }
+
+
}
--
Gitblit v1.7.1