From ce4a770744d7a0b4e4ea3b5101556b94e72bdf1c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 14 十一月 2023 17:49:20 +0800
Subject: [PATCH] 修改打卡
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 82 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 80 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 d8c997f..2afed60 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
@@ -39,6 +39,7 @@
import com.panzhihua.common.model.vos.community.reserve.ComActReserveDangerAreaVO;
import com.panzhihua.common.model.vos.shop.AddShopFlowerGoodsVO;
import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.service_community.entity.VolunteerCommunityConfigVO;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
@@ -11541,7 +11542,8 @@
@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 = false) String orderType);
+ @RequestParam(value = "orderType", required = false) String orderType,
+ @RequestParam(value = "merchantId", required = false) String merchantId);
/**
* 查询详情
@@ -11722,7 +11724,9 @@
public R WithdrawGetList(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize,
@RequestParam(value = "disposeType", required = false) String disposeType,
- @RequestParam(value = "merchantName", required = false) String merchantName);
+ @RequestParam(value = "merchantName", required = false) String merchantName,
+ @RequestParam(value = "merchantId", required = false) String merchantId,
+ @RequestParam(value = "communityId", required = false) String communityId);
/**
* 新增商家提现
@@ -11759,13 +11763,87 @@
+ /***************************************************************************************************************
+ *
+ * 路北社区系统配置 商家折扣 兑换地点信息
+ *
+ ****************************************************************************************************************/
+
+ /**
+ * 详情
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/Community/Config/getData")
+ public R ConfiggetData(@RequestParam("communityId") String communityId);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerMerchant/Community/Config/insertvo")
+ public R Configinsertvo(@RequestBody VolunteerCommunityConfigVO item);
+
+
+
+ /*******************************************************************************************************************
+ *
+ *
+ * 社区折扣
+ *
+ *
+ ******************************************************************************************************************/
+
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/community/discount/getList")
+ public R CommunityDiscountgetList(@RequestParam("communityId") String communityId);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerMerchant/community/discount/insert")
+ public R CommunityDiscountinsert(@RequestBody VolunteerCommunityDiscountVO item);
+
+
+ @PostMapping("/VolunteerMerchant/community/discount/update")
+ public R CommunityDiscountupdate(@RequestBody VolunteerCommunityDiscountVO item);
+
+
+ @DeleteMapping("/VolunteerMerchant/community/discount/delete")
+ public R CommunityDiscountdelete(@RequestParam("id") String id);
+ /**
+ * 报名/取消报名社区活动
+ * 金汇社区专用
+ * @param signactivityVO
+ * 报名参数
+ * @return 报名 取消报名 结果
+ */
+ @PostMapping("/jinhui/jinhuiSignActivity")
+ public R jinhuiSignActivity(@RequestBody SignactivityVO signactivityVO);
+ /**
+ * 用户签到
+ * 金汇社区专用
+ * @param comActActRegistVO 签到参数
+ * @return 签到结果
+ */
+ @PostMapping("/jinhui/jinhuiActivitySignIn")
+ public R jinhuiActivitySignIn(@RequestBody ComActActRegistVO comActActRegistVO);
+
}
--
Gitblit v1.7.1