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 | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 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 50aa117..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 @@ -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); + /***************************************************************************************************** * * 用户积分任务完成情况 @@ -441,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); /** * 分页详情 @@ -512,9 +530,6 @@ */ @GetMapping("/NeedProblem/timedNewFightNeedProblemInventoryHandler") public R timedNewFightNeedProblemInventoryHandler(); - - - -- Gitblit v1.7.1