From 05e1b74b46f283a8841bc284e626e19750ff41b4 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 25 八月 2023 14:31:38 +0800
Subject: [PATCH] 新增积分商城模块（新增商品 编辑商品 删除商品 商品列表） 修改活动人员统计为0 修改小程序活动报名报错
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java | 38 +++++++++++++++++++-------------------
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 2 +-
3 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java
index 5a3b5bf..dda56c2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java
@@ -248,25 +248,25 @@
* @param id
* @return
*/
-// @GetMapping("/VolunteerIntegralMerchant/queryById")
-// public R VolunteerIntegralMerchantQueryById(@RequestParam("id") String id)
-// {
-// return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryById(id);
-// }
-//
-// /**
-// * 分页查询
-// * @param
-// * @return
-// */
-// @GetMapping("/VolunteerIntegralMerchant/queryList")
-// public R VolunteerIntegralMerchantQueryList(@RequestParam("pageNum") int pageNum,
-// @RequestParam("pageSize") int pageSize,
-// @RequestParam("name") String name,
-// @RequestParam("state") String state)
-// {
-// return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state);
-// }
+ @GetMapping("/VolunteerIntegralMerchant/queryById")
+ public R VolunteerIntegralMerchantQueryById(@RequestParam("id") String id)
+ {
+ return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryById(id);
+ }
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerIntegralMerchant/queryList")
+ public R VolunteerIntegralMerchantQueryList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("name") String name,
+ @RequestParam("state") String state)
+ {
+ return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state);
+ }
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 6ffdc73..10de990 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -11510,7 +11510,7 @@
public R VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO);
@DeleteMapping("/VolunteerIntegralMerchant/deleteById")
- public R VolunteerIntegralMerchantDeleteById(@RequestParam String id);
+ public R VolunteerIntegralMerchantDeleteById(@RequestParam("id") String id);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java
index d42ef7d..151e2fd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java
@@ -60,7 +60,7 @@
}
@DeleteMapping("/deleteById")
- public R VolunteerIntegralMerchantDeleteById(@RequestParam String id)
+ public R VolunteerIntegralMerchantDeleteById(@RequestParam("id") String id)
{
return merchantService.VolunteerIntegralMerchantDeleteById(id);
}
--
Gitblit v1.7.1