From a12e09a5bc73672dcd4665d35a1ef8c9d1c534b0 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 16 十月 2023 18:47:11 +0800
Subject: [PATCH] 修改三说会堂
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 390 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 382 insertions(+), 8 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 1dbfb37..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
@@ -26,6 +26,7 @@
import com.panzhihua.common.model.dtos.property.PagePropertyWorkerDTO;
import com.panzhihua.common.model.dtos.property.PropertyWorkerDTO;
import com.panzhihua.common.model.dtos.shop.*;
+import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
@@ -37,6 +38,8 @@
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
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;
@@ -214,12 +217,6 @@
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAppDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollUserByAppDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesInoculationByAdminDTO;
-import com.panzhihua.common.model.vos.BcDictionaryItemVO;
-import com.panzhihua.common.model.vos.BcDictionaryVO;
-import com.panzhihua.common.model.vos.ComActSocialMemberVO;
-import com.panzhihua.common.model.vos.DictionaryVO;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
@@ -257,6 +254,8 @@
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -11336,7 +11335,8 @@
*/
@GetMapping("/VolunteerType/volunteerTypeGetList")
public R volunteerTypeGetList(@RequestParam("pageNum") int pageNum,
- @RequestParam("pageSize") int pageSize);
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("type") String type);
/**
* 新增
@@ -11417,7 +11417,7 @@
* @param grantIntegral
* @return
*/
- @PostMapping("/grantIntegral")
+ @PostMapping("/VolunteerActivitiesPeople/grantIntegral")
public R grantIntegral(@RequestBody GrantIntegral grantIntegral);
/**************************************************************************************************************
@@ -11471,5 +11471,379 @@
@DeleteMapping("/VolunteerIntegralRecord/deleteId")
public R VolunteerIntegralRecordDeleteId(@RequestParam("id") String id);
+ /*************************************************************************************************************
+ *
+ *
+ * 路北社区积分商城
+ *
+ *
+ ****************************************************************************************************************/
+
+ /**
+ * 获取单个详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerIntegralMerchant/queryById")
+ public R VolunteerIntegralMerchantQueryById(@RequestParam("id") String id);
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerIntegralMerchant/queryList")
+ 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 = "goodType", required = false) String goodType,
+ @RequestParam(value = "merchantId", required = false) String merchantId);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerIntegralMerchant/insertVolunteer")
+ public R VolunteerIntegralMerchantInsertVolunteer(@RequestBody VolunteerIntegralMerchantVO vimVO);
+
+ @PostMapping("/VolunteerIntegralMerchant/updateById")
+ public R VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO);
+
+
+ @PostMapping("/VolunteerIntegralMerchant/unmount")
+ public R VolunteerIntegralMerchantUnmount(@RequestBody VolunteerIntegralMerchantVO vimVO);
+
+ @DeleteMapping("/VolunteerIntegralMerchant/deleteById")
+ public R VolunteerIntegralMerchantDeleteById(@RequestParam("id") String id);
+
+
+ /***********************************************************************************************************
+ *
+ *
+ * 订单兑换
+ *
+ *
+ ***********************************************************************************************************/
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerIntegralMerchant/order/getList")
+ public R getList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "goodsId", required = false) String goodsId,
+ @RequestParam(value = "orderNumber", required = false) String orderNumber,
+ @RequestParam(value = "goodsName", required = false) String goodsName,
+ @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 = "orderType", required = false) String orderType,
+ @RequestParam(value = "merchantId", required = false) String merchantId);
+
+ /**
+ * 查询详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerIntegralMerchant/order/getData")
+ public R getData(@RequestParam("id") String id);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerIntegralMerchant/order/insertData")
+ public R insertData(@RequestBody VolunteerCreditsExchangeVO item);
+
+ /**
+ * 新增用户购买商家商品记录
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerIntegralMerchant/order/insertMerchantData")
+ public R insertMerchantData(@RequestBody VolunteerCreditsExchangeVO item);
+
+ /**
+ * 更新
+ * @param item
+ * @return
+ */
+ @PostMapping("/VolunteerIntegralMerchant/order/update")
+ public R update(@RequestBody VolunteerCreditsExchangeVO item);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/VolunteerIntegralMerchant/order/delete")
+ public R delete(@RequestParam("id") String id);
+
+ /**
+ * 核销
+ * @param id
+ * @return
+ */
+ @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);
+
+ /**
+ * 是否是商家
+ * @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);
+
+
+
+
+
+ /****************************************************************************************************************
+ *
+ * 商家评论
+ *
+ ***************************************************************************************************************/
+
+ /**
+ * 商家评论分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/evaluate/getList")
+ public R volunteerMerchantGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("communityId") String communityId,
+ @RequestParam("merchantId") String merchantId);
+
+ /**
+ * 商家评论获取详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/evaluate/getData")
+ public R volunteerMerchantGetData(@RequestParam("id") String id);
+
+ /**
+ * 商家评论新增评价
+ * @return
+ */
+ @PostMapping("/VolunteerMerchant/evaluate/insert")
+ public R volunteerMerchantInsert(@RequestBody VolunteerMerchantEvaluateVO item);
+
+ /**
+ * 商家评论更新评价
+ * @return
+ */
+ @PostMapping("/VolunteerMerchant/evaluate/update")
+ public R volunteerMerchantUpdate(@RequestBody VolunteerMerchantEvaluateVO item);
+
+
+ /**
+ * 商家评论删除评价
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/VolunteerMerchant/evaluate/delete")
+ public R volunteerMerchantDelete(@RequestParam("id") String id);
+
+
+
+ /***************************************************************************************************************
+ *
+ * 路北社区商家提现
+ *
+ ****************************************************************************************************************/
+
+ /**
+ * 商家提现列表啊
+ * @param disposeType
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/withdraw/getList")
+ 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 = "merchantId", required = false) String merchantId,
+ @RequestParam(value = "communityId", required = false) String communityId);
+
+ /**
+ * 新增商家提现
+ * @param item
+ * @return
+ */
+ @PostMapping("/VolunteerMerchant/withdraw/insert")
+ public R WithdrawInsert(@RequestBody VolunteerMerchantWithdrawVO item);
+
+ /**
+ * 编辑商家提现
+ * @param item
+ * @return
+ */
+ @PostMapping("/VolunteerMerchant/withdraw/update")
+ public R WithdrawUpdate(@RequestBody VolunteerMerchantWithdrawVO item);
+
+ /**
+ * 删除商家提现
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/withdraw/delete")
+ public R WithdrawDelete(@RequestParam("id") String id);
+
+ /**
+ * 处理商家提现
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/withdraw/dispose")
+ public R WithdrawDispose(@RequestParam("id") String id);
+
+
+
+
+ /***************************************************************************************************************
+ *
+ * 路北社区系统配置 商家折扣 兑换地点信息
+ *
+ ****************************************************************************************************************/
+
+ /**
+ * 详情
+ * @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