From d6fbe095d6b9889cf16b7d3b55df2d6517b3e141 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 31 八月 2023 15:07:03 +0800
Subject: [PATCH] 新增小程序修改商家接口
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java | 67 +++++++++++++++++++++++++++++++--
1 files changed, 63 insertions(+), 4 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 dda56c2..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
@@ -3,6 +3,7 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.VolunteerActivitiesPeopleVO;
+import com.panzhihua.common.model.vos.community.VolunteerIntegralMerchantVO;
import com.panzhihua.common.model.vos.community.VolunteerIntegralRecordVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.StringUtils;
@@ -167,7 +168,7 @@
public R volunteerTypeGetList(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize)
{
- return volunteerActivitiesPeople.volunteerTypeGetList(pageNum,pageSize);
+ return volunteerActivitiesPeople.volunteerTypeGetList(pageNum,pageSize,"1");
}
/**************************************************************************************************
@@ -262,13 +263,71 @@
@GetMapping("/VolunteerIntegralMerchant/queryList")
public R VolunteerIntegralMerchantQueryList(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize,
- @RequestParam("name") String name,
- @RequestParam("state") String state)
+ @RequestParam(value = "name", required = false) String name,
+ @RequestParam(value = "state", required = false) String state)
{
- return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state);
+ 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);
+ }
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @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);
+ }
+
+ @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);
+ }
+
+
+ @PostMapping("/VolunteerIntegralMerchant/unmount")
+ public R VolunteerIntegralMerchantUnmount(@RequestBody VolunteerIntegralMerchantVO vimVO)
+ {
+ vimVO.setGoodType("1");
+ return volunteerActivitiesPeople.VolunteerIntegralMerchantUnmount(vimVO);
+ }
+
+
+ @DeleteMapping("/VolunteerIntegralMerchant/deleteById")
+ public R VolunteerIntegralMerchantDeleteById(@RequestParam("id") String id)
+ {
+ return volunteerActivitiesPeople.VolunteerIntegralMerchantDeleteById(id);
+ }
}
--
Gitblit v1.7.1