From ea01357b626ef4dc8326ff39da6f31e17bf2c0f9 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 30 八月 2023 15:29:09 +0800
Subject: [PATCH] 新增小程序判断是否是商家
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 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 3cdb075..3616ab0 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
@@ -11495,7 +11495,9 @@
public R VolunteerIntegralMerchantQueryList(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize,
@RequestParam(value = "name", required = false) String name,
- @RequestParam(value = "state", required = false) String state);
+ @RequestParam(value = "state", required = false) String state,
+ @RequestParam(value = "goodType", required = false) String goodType,
+ @RequestParam(value = "merchantId", required = false) String merchantId);
/**
* 新增
@@ -11538,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);
/**
* 查询详情
@@ -11555,6 +11558,14 @@
*/
@PostMapping("/VolunteerIntegralMerchant/order/insertData")
public R insertData(@RequestBody VolunteerCreditsExchangeVO item);
+
+ /**
+ * 新增用户购买商家商品记录
+ * @param
+ * @return
+ */
+ @PostMapping("/order/insertMerchantData")
+ public R insertMerchantData(@RequestBody VolunteerCreditsExchangeVO item);
/**
* 更新
@@ -11614,11 +11625,23 @@
@DeleteMapping("/VolunteerMerchant/delete")
- public R deleteVolunteerMerchant(@RequestParam("pageNum") String id);
+ public R deleteVolunteerMerchant(@RequestParam("id") String id);
@GetMapping("/VolunteerMerchant/getUser")
- public R volunteerMerchantGetUser(@RequestParam("pageNum") String communityId,
- @RequestParam("pageNum") String userName,
- @RequestParam("pageNum") String userPhone);
+ public R volunteerMerchantGetUser(@RequestParam("communityId") String communityId,
+ @RequestParam(value = "userName", required = false) String userName,
+ @RequestParam(value = "userPhone", required = false)String userPhone);
+
+
+ @GetMapping("/VolunteerMerchant/getById")
+ public R volunteerMerchantGetById(@RequestParam("id") String id);
+
+ /**
+ * 是否是商家
+ * @param userId
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/isMerchant")
+ public R isMerchant(@RequestParam("userId") String userId);
}
--
Gitblit v1.7.1