From f425a4523a844a71ed9b1acf74b94e94d0886a0f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 29 十一月 2023 14:06:22 +0800
Subject: [PATCH] 修改金汇办事指南线上线下问题
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java | 66 ++++++++++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
index 6044cce..bd1232d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
@@ -297,7 +297,7 @@
*/
@GetMapping("/FightShopping/getFightShoppingList")
public R getFightShoppingList(@RequestParam("pageNum") int pageNum,
- @RequestParam("pageNum") int pageSize,
+ @RequestParam("pageSize") int pageSize,
@RequestParam("communityId") String communityId,
@RequestParam(value = "goodName", required = false)String goodName,
@RequestParam(value = "goodType", required = false)String goodType,
@@ -378,6 +378,22 @@
public R editMerchantData(@RequestBody NewFightConvenientMerchantVO item);
+ @GetMapping("/FightConvenient/selectUserList")
+ public R selectUserList(@RequestParam("communityId") String communityId,
+ @RequestParam("phoneOrname") String phoneOrname);
+
+
+
+ @GetMapping("/FightConvenient/selectUserListB")
+ public R selectUserListB(@RequestParam("communityId") String communityId,
+ @RequestParam("phoneOrname") String phoneOrname);
+
+
+
+ @GetMapping("/FightConvenient/selectUserBind")
+ public R selectUserBind(@RequestParam("communityId") String communityId,
+ @RequestParam("userId") String userId);
+
/*****************************************************************************************************
*
* 用户积分任务完成情况
@@ -409,6 +425,18 @@
@PostMapping("/IntegratingTask/upIntegral")
public R upIntegral(@RequestBody NewFightIntegral item);
+
+ /**
+ * 每日签到记录列表 前15条
+ * @param userId
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/IntegratingTask/getEverydayList")
+ public R getEverydayList(@RequestParam("userId") String userId,
+ @RequestParam("communityId") String communityId);
+
+
/*******************************************************************************************************************
*
@@ -429,7 +457,9 @@
@RequestParam(value = "goodName", required = false)String goodName,
@RequestParam(value = "name", required = false)String name,
@RequestParam(value = "cancelType", required = false)String cancelType,
- @RequestParam(value = "communityId", required = false)String communityId);
+ @RequestParam(value = "communityId", required = false)String communityId,
+ @RequestParam(value = "merchantId", required = false) String merchantId,
+ @RequestParam(value = "orderType", required = false) String orderType);
/**
* 分页详情
@@ -478,4 +508,36 @@
@RequestParam(value = "communityId") String communityId);
+
+
+
+
+
+
+
+
+
+ /**
+ * 每日定时清空 定时任务
+ */
+ @GetMapping("/IntegratingTask/everydaYtruncateData")
+ public R truncateData();
+
+
+ /**
+ * 新双争双评需求问题清单 任务认领 开始 结束 定时任务
+ * @return
+ */
+ @GetMapping("/NeedProblem/timedNewFightNeedProblemInventoryHandler")
+ public R timedNewFightNeedProblemInventoryHandler();
+
+
+
+
+
+
+
+
+
+
}
\ No newline at end of file
--
Gitblit v1.7.1