From 0d15a472f111a8fd73b549ac0247313f32df0214 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 31 八月 2023 14:56:48 +0800
Subject: [PATCH] 新增小程序设置积分支付密码接口   验证密码接口

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 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 aac355c..1517321 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);
 
     /**************************************************************************************************************
@@ -11541,7 +11541,7 @@
                      @RequestParam(value = "userName", required = false) String userName,
                      @RequestParam(value = "communityId", required = false) String communityId,
                      @RequestParam(value = "userId", required = false) String userId,
-                     @RequestParam(value = "orderType", required = true) String orderType);
+                     @RequestParam(value = "orderType", required = false) String orderType);
 
     /**
      * 查询详情
@@ -11558,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);
 
     /**
      * 更新
@@ -11628,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