From 0ffc55f78dfb3cc561540af2d033e64c2f4f2e68 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 29 八月 2023 09:57:08 +0800
Subject: [PATCH] 新增商家管理模块
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 364 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 358 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 9d911d5..3cdb075 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
@@ -1,5 +1,6 @@
package com.panzhihua.common.service.community;
+import java.util.Date;
import java.util.List;
import com.panzhihua.common.model.dtos.PageBaseDTO;
@@ -25,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;
@@ -36,6 +38,7 @@
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 io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
@@ -213,12 +216,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;
@@ -256,6 +253,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
@@ -11265,8 +11264,361 @@
public R deleteById(@RequestParam("id") String Id);
+ /********************************************************************************************************************
+ *
+ *
+ * 志愿者活动
+ *
+ *
+ *******************************************************************************************************************/
+ /**
+ * 获取单个详情
+ * @param id
+ * @return
+ */
+ @GetMapping("Volunteer/queryById")
+ R volunteerQueryById(@RequestParam("id") String id);
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("Volunteer/queryList")
+ R volunteerQueryList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "name", required = false) String name,
+ @RequestParam(value = "acState", required = false) String acState,
+ @RequestParam(value = "acType", required = false) String acType,
+ @RequestParam(value = "actityBeginTime", required = false) Date actityBeginTime,
+ @RequestParam(value = "actityEndTime", required = false) Date actityEndTime);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("Volunteer/insertVolunteer")
+ R insertVolunteer(@RequestBody VolunteerActivityVO volunteerActivityVO);
+
+
+ @PostMapping("Volunteer/updateById")
+ R volunteerUpdateById(@RequestBody VolunteerActivityVO volunteerActivityVO);
+
+
+ @DeleteMapping("Volunteer/deleteById")
+ R volunteerDeleteById(@RequestParam("id") String id);
+ /**
+ * 定时刷新活动状态
+ * @return
+ */
+ @GetMapping("/Volunteer/timedTaskVolunteerActivitiesJobHandler")
+ public R timedTaskVolunteerActivitiesJobHandler();
+
+
+ /*******************************************************************************************************************
+ *
+ *
+ * 志愿者活动类型
+ *
+ *
+ *******************************************************************************************************************/
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerType/volunteerTypeGetList")
+ public R volunteerTypeGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("type") String type);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerType/insertvolunteerType")
+ public R insertvolunteerType(@RequestBody VolunteerTypeVO volunteerTypeVO);
+
+ /**
+ * 更新
+ * @param volunteerTypeVO
+ * @return
+ */
+ @PostMapping("/VolunteerType/volunteerTypeUpdate")
+ public R volunteerTypeUpdate(@RequestBody VolunteerTypeVO volunteerTypeVO);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/VolunteerType/volunteerTypeDelete")
+ public R volunteerTypeDelete(@RequestParam("id") String id);
+
+ /*****************************************************************************************************************
+ *
+ *
+ * 志愿者参加活动
+ *
+ *
+ ****************************************************************************************************************/
+ /**
+ * 志愿者单个详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerActivitiesPeople/vapGetById")
+ public R vapGetById(@RequestParam("id") String id);
+
+ /**
+ * 参与人员列表
+ * @param activityId
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/VolunteerActivitiesPeople/vapGetList")
+ public R vapGetList(@RequestParam("activityId") String activityId,
+ @RequestParam("communityId") String communityId);
+
+ /**
+ * 添加参与人员
+ * @param volunteerActivitiesPeopleVO
+ * @return
+ */
+ @PostMapping("/VolunteerActivitiesPeople/vapInsert")
+ public R vapInsert(@RequestBody VolunteerActivitiesPeopleVO volunteerActivitiesPeopleVO);
+
+ /**
+ * 修改参与人员
+ * @param volunteerActivitiesPeopleVO
+ * @return
+ */
+ @PostMapping("/VolunteerActivitiesPeople/vapUpdate")
+ public R vapUpdate(@RequestBody VolunteerActivitiesPeopleVO volunteerActivitiesPeopleVO);
+
+ /**
+ * 删除参与人员
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/VolunteerActivitiesPeople/vapDelete")
+ public R vapDelete(@RequestParam("id") String id);
+
+
+ /**
+ * 志愿者活动 奖励发放
+ * @param grantIntegral
+ * @return
+ */
+ @PostMapping("/grantIntegral")
+ public R grantIntegral(@RequestBody GrantIntegral grantIntegral);
+
+ /**************************************************************************************************************
+ *
+ *
+ * 积分明细记录
+ *
+ *****************************************************************************************************************/
+ /**
+ * 获取单个详情
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerIntegralRecord/getId")
+ public R VolunteerIntegralRecordGetId(@RequestParam("id") String id);
+
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerIntegralRecord/getList")
+ public R VolunteerIntegralRecordGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("userId") String userId);
+
+ /**
+ * 新增
+ *
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerIntegralRecord/insertVolunteer")
+ public R VolunteerIntegralRecordInsertVolunteer(@RequestBody() VolunteerIntegralRecordVO volunteerIntegralRecordVO);
+
+ /**
+ * 便捷
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerIntegralRecord/updateId")
+ public R VolunteerIntegralRecordUpdateId(@RequestBody() VolunteerIntegralRecordVO volunteerIntegralRecordVO);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @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);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerIntegralMerchant/insertVolunteer")
+ public R VolunteerIntegralMerchantInsertVolunteer(@RequestBody VolunteerIntegralMerchantVO vimVO);
+
+ @PostMapping("/VolunteerIntegralMerchant/updateById")
+ public R VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO);
+
+
+ @PostMapping("/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);
+
+ /**
+ * 查询详情
+ * @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 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("pageNum") String id);
+
+ @GetMapping("/VolunteerMerchant/getUser")
+ public R volunteerMerchantGetUser(@RequestParam("pageNum") String communityId,
+ @RequestParam("pageNum") String userName,
+ @RequestParam("pageNum") String userPhone);
}
--
Gitblit v1.7.1