From 2f07df24db44a6ae121ee68f855c6a63b372d8ce Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 29 八月 2023 17:47:27 +0800
Subject: [PATCH] 修改核销报错
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerMerchantApi.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerMerchantApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerMerchantApi.java
index a2bf60c..c7cdfc4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerMerchantApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerMerchantApi.java
@@ -17,13 +17,21 @@
@Resource
private VolunteerMerchantService vtService;
+
+
+ @GetMapping("/getById")
+ public R volunteerMerchantGetById(@RequestParam("id") String id)
+ {
+ return vtService.getById(id);
+ }
+
/**
* 分页查询
* @param
* @return
*/
@GetMapping("/getList")
- public R volunteerMerchantGetList(@RequestParam("pageNum") int pageNum,
+ public R volunteerMerchantGetList( int pageNum,
@RequestParam("pageSize") int pageSize,
@RequestParam(value = "merchantState", required = false) String merchantState,
@RequestParam(value = "merchantType", required = false) String merchantType,
@@ -61,10 +69,10 @@
@GetMapping("/getUser")
public R volunteerMerchantGetUser(@RequestParam("communityId") String communityId,
- @RequestParam("userName") String userName,
- @RequestParam("userPhone") String userPhone)
+ @RequestParam(value = "userName", required = false) String userName,
+ @RequestParam(value = "userPhone", required = false) String userPhone)
{
- return R.ok(vtService.getUser(communityId,userName,userPhone));
+ return vtService.getUser(communityId,userName,userPhone);
}
--
Gitblit v1.7.1