From cbe3888bb6b1012273f16409f988114abd4542c5 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 30 八月 2023 14:10:00 +0800
Subject: [PATCH] 新增小程序商家购买下单接口 小程序积分兑换记录列表修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 72 +++++++++++++++++++++++++++++++----
1 files changed, 63 insertions(+), 9 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 70542af..0278190 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
@@ -11334,7 +11334,8 @@
*/
@GetMapping("/VolunteerType/volunteerTypeGetList")
public R volunteerTypeGetList(@RequestParam("pageNum") int pageNum,
- @RequestParam("pageSize") int pageSize);
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("type") String type);
/**
* 新增
@@ -11494,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);
/**
* 新增
@@ -11528,7 +11531,7 @@
* @param
* @return
*/
- @GetMapping("order/getList")
+ @GetMapping("/VolunteerIntegralMerchant/order/getList")
public R getList(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize,
@RequestParam(value = "goodsId", required = false) String goodsId,
@@ -11537,14 +11540,15 @@
@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);
/**
* 查询详情
* @param id
* @return
*/
- @GetMapping("order/getData")
+ @GetMapping("/VolunteerIntegralMerchant/order/getData")
public R getData(@RequestParam("id") String id);
/**
@@ -11552,15 +11556,23 @@
* @param
* @return
*/
- @PostMapping("/order/insertData")
+ @PostMapping("/VolunteerIntegralMerchant/order/insertData")
public R insertData(@RequestBody VolunteerCreditsExchangeVO item);
+
+ /**
+ * 新增用户购买商家商品记录
+ * @param
+ * @return
+ */
+ @PostMapping("/order/insertMerchantData")
+ public R insertMerchantData(@RequestBody VolunteerCreditsExchangeVO item);
/**
* 更新
* @param item
* @return
*/
- @PostMapping("/order/update")
+ @PostMapping("/VolunteerIntegralMerchant/order/update")
public R update(@RequestBody VolunteerCreditsExchangeVO item);
/**
@@ -11568,7 +11580,7 @@
* @param id
* @return
*/
- @DeleteMapping("/order/delete")
+ @DeleteMapping("/VolunteerIntegralMerchant/order/delete")
public R delete(@RequestParam("id") String id);
/**
@@ -11576,10 +11588,52 @@
* @param id
* @return
*/
- @GetMapping("/order/conditionData")
+ @GetMapping("/VolunteerIntegralMerchant/order/conditionData")
public R conditionData(@RequestParam("id") String id);
+ /*****************************************************************************************************************
+ *
+ *
+ * 路北社区商家管理
+ *
+ *
+ *****************************************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/getList")
+ public R volunteerMerchantGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "merchantState", required = false) String merchantState,
+ @RequestParam(value = "merchantType", required = false) String merchantType,
+ @RequestParam(value = "name", required = false) String name,
+ @RequestParam(value = "communityId", required = false) String communityId);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerMerchant/insert")
+ public R insertVolunteerMerchant(@RequestBody VolunteerMerchantVO vtvo);
+ @PostMapping("/VolunteerMerchant/update")
+ public R updateVolunteerMerchant(@RequestBody VolunteerMerchantVO vtvo);
+
+
+ @DeleteMapping("/VolunteerMerchant/delete")
+ public R deleteVolunteerMerchant(@RequestParam("id") String id);
+
+ @GetMapping("/VolunteerMerchant/getUser")
+ 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);
}
--
Gitblit v1.7.1