From 66e4211cbfa154a87390b25c93b32d722e0d690c Mon Sep 17 00:00:00 2001
From: xiang <5914123@qq.com>
Date: 星期四, 14 九月 2023 15:22:37 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 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 298fcb4..d8a2672 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
@@ -266,7 +266,23 @@
@RequestParam(value = "name", required = false) String name,
@RequestParam(value = "state", required = false) String state)
{
- return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state,"1",null);
+ return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state,"0",null);
+ }
+
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerIntegralMerchant/merchantQueryList")
+ public R MerchantQueryList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "name", required = false) String name,
+ @RequestParam(value = "state", required = false) String state,
+ @RequestParam(value = "merchantId", required = false) String merchantId)
+ {
+ return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state,"1",merchantId);
}
@@ -278,6 +294,11 @@
@PostMapping("/VolunteerIntegralMerchant/insertVolunteer")
public R VolunteerIntegralMerchantInsertVolunteer(@RequestBody VolunteerIntegralMerchantVO vimVO)
{
+ if(StringUtils.isEmpty(vimVO.getMerchantId()))
+ {
+ return R.fail("商家id不能为空");
+ }
+
vimVO.setGoodType("1");
return volunteerActivitiesPeople.VolunteerIntegralMerchantInsertVolunteer(vimVO);
}
@@ -285,6 +306,11 @@
@PostMapping("/VolunteerIntegralMerchant/updateById")
public R VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO)
{
+ if(StringUtils.isEmpty(vimVO.getMerchantId()))
+ {
+ return R.fail("商家id不能为空");
+ }
+
vimVO.setGoodType("1");
return volunteerActivitiesPeople.VolunteerIntegralMerchantUpdateById(vimVO);
}
--
Gitblit v1.7.1