From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 7 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 6282607..a7a1eaf 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
@@ -12,6 +12,7 @@
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;
@@ -540,9 +541,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)
@@ -561,7 +564,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)
@@ -645,6 +648,19 @@
/**
+ * 每日签到记录列表 前15条
+ * @return
+ */
+ @ApiOperation(value = "每日签到记录列表 前15条", response = IntegratingTaskVO.class)
+ @GetMapping("/IntegratingTask/getEverydayList")
+ public R getEverydayList()
+ {
+ return newStriveForFeign.getEverydayList(getUserId()+"",getCommunityId()+"");
+ }
+
+
+
+ /**
* 添加或者修改积分
* @param item
* @return
@@ -676,10 +692,12 @@
@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 = "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()+"");
+ goodName,name,cancelType,getCommunityId()+"",merchantId,orderType);
}
/**
@@ -703,8 +721,9 @@
@PostMapping("/orderAddData")
public R orderAddData(@RequestBody NewFightShoppingOrderVO item)
{
- item.setCommunityId(getCommunityId()+"");
- item.setUserId(getUserId()+"");
+// item.setCommunityId(getCommunityId()+"");
+// item.setUserId(getUserId()+"");
+// item.setOrderType("1");
return newStriveForFeign.orderAddData(item);
}
@@ -766,8 +785,29 @@
}
+ @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