From d22e1edaf883f878685eda9b43b90f72e81c4b7b Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 31 八月 2023 16:43:21 +0800
Subject: [PATCH] 修改用户商家上下架问题
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
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 0f0c409..c9b7b05 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
@@ -11416,7 +11416,7 @@
* @param grantIntegral
* @return
*/
- @PostMapping("/grantIntegral")
+ @PostMapping("/VolunteerActivitiesPeople/grantIntegral")
public R grantIntegral(@RequestBody GrantIntegral grantIntegral);
/**************************************************************************************************************
@@ -11511,7 +11511,7 @@
public R VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO);
- @PostMapping("/unmount")
+ @PostMapping("/VolunteerIntegralMerchant/unmount")
public R VolunteerIntegralMerchantUnmount(@RequestBody VolunteerIntegralMerchantVO vimVO);
@DeleteMapping("/VolunteerIntegralMerchant/deleteById")
@@ -11540,7 +11540,8 @@
@RequestParam(value = "condition", required = false) String condition,
@RequestParam(value = "userName", required = false) String userName,
@RequestParam(value = "communityId", required = false) String communityId,
- @RequestParam(value = "userId", required = false) String userId);
+ @RequestParam(value = "userId", required = false) String userId,
+ @RequestParam(value = "orderType", required = false) String orderType);
/**
* 查询详情
@@ -11557,6 +11558,14 @@
*/
@PostMapping("/VolunteerIntegralMerchant/order/insertData")
public R insertData(@RequestBody VolunteerCreditsExchangeVO item);
+
+ /**
+ * 新增用户购买商家商品记录
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerIntegralMerchant/order/insertMerchantData")
+ public R insertMerchantData(@RequestBody VolunteerCreditsExchangeVO item);
/**
* 更新
@@ -11627,4 +11636,21 @@
@GetMapping("/VolunteerMerchant/getById")
public R volunteerMerchantGetById(@RequestParam("id") String id);
+ /**
+ * 是否是商家
+ * @param userId
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/isMerchant")
+ public R isMerchant(@RequestParam("userId") String userId);
+
+
+ /**
+ * 社区取消订单
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerIntegralMerchant/order/communityCancellation")
+ public R communityCancellation(@RequestParam("id") String id);
+
}
--
Gitblit v1.7.1