From b1f3e95844ee460b0b9ba3a8cf6e9a7a40a8f5c7 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 30 八月 2023 14:27:41 +0800
Subject: [PATCH] 新增小程序商品添加 修改 上下架 查询 删除接口
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java | 33 ++++++++++++++++
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java | 28 +-------------
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerMerchantApi.java | 6 +-
3 files changed, 38 insertions(+), 29 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 1d681de..298fcb4 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;
@@ -269,6 +270,38 @@
}
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerIntegralMerchant/insertVolunteer")
+ public R VolunteerIntegralMerchantInsertVolunteer(@RequestBody VolunteerIntegralMerchantVO vimVO)
+ {
+ vimVO.setGoodType("1");
+ return volunteerActivitiesPeople.VolunteerIntegralMerchantInsertVolunteer(vimVO);
+ }
+ @PostMapping("/VolunteerIntegralMerchant/updateById")
+ public R VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO)
+ {
+ 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);
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java
index ad65d6b..d49dcd5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java
@@ -78,30 +78,6 @@
***********************************************************************************************************/
/**
- * 分页查询
- * @param
- * @return
- */
- @GetMapping("order/getList")
- public R getList(@RequestParam("pageNum") int pageNum,
- @RequestParam("pageSize") int pageSize,
- @RequestParam(value = "goodsId", required = false) String goodsId,
- @RequestParam(value = "orderNumber", required = false) String orderNumber,
- @RequestParam(value = "goodsName", required = false) String goodsName,
- @RequestParam(value = "condition", required = false) String condition,
- @RequestParam(value = "userName", required = false) String userName,
- @RequestParam(value = "communityId", required = false) String communityId)
- {
-
- if(StringUtils.isEmpty(communityId))
- {
- communityId=getCommunityId()+"";
- }
- return communityService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
- condition,userName,communityId,getLoginUserInfo().getUserId()+"","1");
- }
-
- /**
* 查询详情
* @param id
* @return
@@ -212,7 +188,7 @@
/***********************************************************************************************************
*
*
- * 订单兑换
+ * 商家订单兑换
*
*
***********************************************************************************************************/
@@ -231,7 +207,7 @@
@RequestParam(value = "condition", required = false) String condition,
@RequestParam(value = "userName", required = false) String userName,
@RequestParam(value = "communityId", required = false) String communityId,
- @RequestParam(value = "communityId", required = false) String orderType)
+ @RequestParam(value = "orderType", required = false) String orderType)
{
if(StringUtils.isEmpty(communityId))
{
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerMerchantApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerMerchantApi.java
index 16ef49e..7fad714 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerMerchantApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerMerchantApi.java
@@ -125,14 +125,14 @@
@PostMapping("/insertVolunteer")
public R VolunteerIntegralMerchantInsertVolunteer(@RequestBody VolunteerIntegralMerchantVO vimVO)
{
- vimVO.setGoodType("2");
+ vimVO.setGoodType("1");
return vtService.VolunteerIntegralMerchantInsertVolunteer(vimVO);
}
@PostMapping("/updateById")
public R VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO)
{
- vimVO.setGoodType("2");
+ vimVO.setGoodType("1");
return vtService.VolunteerIntegralMerchantUpdateById(vimVO);
}
@@ -140,7 +140,7 @@
@PostMapping("/unmount")
public R VolunteerIntegralMerchantUnmount(@RequestBody VolunteerIntegralMerchantVO vimVO)
{
- vimVO.setGoodType("2");
+ vimVO.setGoodType("1");
return vtService.VolunteerIntegralMerchantUnmount(vimVO);
}
--
Gitblit v1.7.1