From d76c9f4e730422cbe43496adfc57a6e3d36577ab Mon Sep 17 00:00:00 2001
From: luoyuanqiao <2376770955@qq.com>
Date: 星期二, 01 三月 2022 13:54:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/partyBuilding_lyq' into partyBuilding_lyq
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 382 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 350 insertions(+), 32 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 e67238b..119e327 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
@@ -2,22 +2,7 @@
import java.util.List;
-import com.panzhihua.common.model.dtos.PageBaseDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.DisableOrEnableMcsMerchantDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsGameDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsInfoDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsProductDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsEvaluateDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsGameDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsInformationDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsMerchantDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsProductDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetPopularForGameDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForGameDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForInfoDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForProductDTO;
-import com.panzhihua.common.model.vos.community.microCommercialStreet.McsConfigVO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.DeleteProductDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -29,6 +14,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
@@ -168,8 +154,32 @@
import com.panzhihua.common.model.dtos.community.integral.admin.EditComActIntegralRuleDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralRuleDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralTradeDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.DisableOrEnableMcsMerchantDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsEvaluateDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsGameDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsInfoDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsProductDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageJoinGameListDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsEvaluateDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsGameDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsInformationDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsMerchantDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsProductDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageVerifyRecordDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.PutUserInfoDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetPopularForGameDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForGameDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForInfoDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForProductDTO;
import com.panzhihua.common.model.dtos.community.questnaire.StatisticsSummaryDTO;
-import com.panzhihua.common.model.dtos.community.rentingHouses.*;
+import com.panzhihua.common.model.dtos.community.rentingHouses.NearbyDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.PageRentingHouseRegisterDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.PageRentingHousesConfigDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.ReleaseOrCancelHouseDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHouseRegisterDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHousesConfigDTO;
import com.panzhihua.common.model.dtos.community.reserve.AddReserveAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.CancelReserveRecordDTO;
import com.panzhihua.common.model.dtos.community.reserve.ComActReserveMakeStatisticsDTO;
@@ -325,6 +335,8 @@
import com.panzhihua.common.model.vos.community.bigscreen.PartyBuildingMemberVO;
import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
+import com.panzhihua.common.model.vos.community.microCommercialStreet.McsConfigVO;
+import com.panzhihua.common.model.vos.community.microCommercialStreet.McsOrderVO;
import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
@@ -345,6 +357,8 @@
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
+
+import javax.validation.Valid;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -1185,7 +1199,7 @@
* @return 社区集合 按照创建顺序倒序排列
*/
@PostMapping("listcommunityall")
- R listCommunityAll();
+ R listCommunityAll(@RequestParam("areaCode")String areaCode);
/**
* 首页广告banner
@@ -2517,6 +2531,17 @@
R pagePopulation(ComMngPopulationDTO comMngPopulationVO);
/**
+ * 导出老人
+ *
+ * @param comMngPopulationVO
+ * 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("/common/data/population/exportOld")
+ R exportOld(ComMngPopulationDTO comMngPopulationVO);
+
+
+ /**
* 根据身份证查询实有人口信息
*/
@GetMapping("/common/data/population/selectByIdCard")
@@ -3343,7 +3368,7 @@
* @date 2021/8/31 15:03
*/
@GetMapping("/workGuide/classify/getList")
- R getWorkGuideClassifyList();
+ R getWorkGuideClassifyList(@RequestParam("areaCode")String areaCode);
/**
* 分页查询邻里圈
@@ -4956,7 +4981,7 @@
* @return 社区列表
*/
@GetMapping("/eventgrid/community/westList")
- R getWestCommunityLists();
+ R getWestCommunityLists(@RequestParam("areaCode")String areaCode);
/**
* 综治app-小区列表
@@ -5411,7 +5436,7 @@
* @return 社区列表
*/
@GetMapping("/switch/community/all/list")
- R communitySwitchList();
+ R communitySwitchList(@RequestParam("areaCode") String areaCode);
/**
* 根据名字查询所有社区列表
@@ -5421,7 +5446,7 @@
* @return 社区列表
*/
@GetMapping("/switch/community/search/list")
- R communitySwitchSearchList(@RequestParam(value = "name") String name);
+ R communitySwitchSearchList(@RequestParam(value = "name") String name,@RequestParam(value = "areaCode") String areaCode);
/**
* 根据经纬度以及距离搜索附近社区列表
@@ -5519,7 +5544,7 @@
* @return 随手拍分类列表
*/
@GetMapping("/classify/admin/list")
- R listPhotoClassify();
+ R listPhotoClassify(@RequestParam("areaCode") String areaCode);
/**
* 社区后台-切换随手拍公示状态
@@ -5745,6 +5770,14 @@
*/
@PostMapping("/reserve/admin/register/detailed/list")
R registerDetailedListAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
+
+ /**
+ * 导出登记明细列表
+ * @param detailedAdminDTO 请求参数
+ * @return 登记明细列表
+ */
+ @PostMapping("/reserve/admin/register/detailed/list/export")
+ R registerDetailedListAdminExport(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
/**
* 查询登记详情记录
@@ -6358,7 +6391,7 @@
* @return
*/
@GetMapping("/convenient/service-category/all")
- R getAllServiceCategories();
+ R getAllServiceCategories(@RequestParam("areaCode") String areaCode);
/**
* 获取用户便民服务商家详情
@@ -6479,7 +6512,7 @@
* @return
*/
@GetMapping("/convenient/service-category/suitable")
- R getSuitableServiceCategories(@RequestParam("communityId") Long communityId);
+ R getSuitableServiceCategories(@RequestParam("communityId") Long communityId,@RequestParam("areaCode")String areaCode);
/**
* 获取该社区下的热门商家
@@ -7545,11 +7578,11 @@
/**
* 党员积分前3
- * @param communityId
+ * @param pageBigScreenStatisticPartyOrg
* @return
*/
- @GetMapping("/bigscreen/party/partyActivityTop")
- R partyActivityTop(@RequestParam("communityId")Long communityId);
+ @PostMapping("/bigscreen/party/partyActivityTop")
+ R partyActivityTop(@RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg);
/**
* 社区服务大屏数据分析接口
@@ -7727,6 +7760,23 @@
*/
@PostMapping("/screen/index/volunteerActList")
R indexVolunteerActList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 清网治格-根据事件分类获取近1月的社区事件数据
+ * @param type
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/event/list")
+ R getEventList(@RequestParam(value = "type") Integer type, @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 清网治格-社区事件数据分页
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/event/page")
+ R pageEventList(@RequestBody PageBaseDTO pageBaseDTO);
/**
* 新增数字商业街商家
@@ -7960,12 +8010,11 @@
/**
* 删除产品信息
- * @param productId
- * @param userId
+ * @param deleteProductDTO
* @return
*/
- @DeleteMapping("/microcommercialstreet/product/delete")
- R deleteMcsProduct(@RequestParam("productId") Long productId, @RequestParam("userId") Long userId);
+ @PostMapping("/microcommercialstreet/product/delete")
+ R deleteMcsProduct(@RequestBody DeleteProductDTO deleteProductDTO);
/**
* 上架/下架产品信息
@@ -7982,4 +8031,273 @@
*/
@PostMapping("/microcommercialstreet/product/page")
R pageMcsProduct(@RequestBody PageMcsProductDTO pageMcsProductDTO);
+
+ /**
+ * 获取产品标签列表
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/label/list")
+ R getMcsLabelList(@RequestParam("userId") Long userId);
+
+ /**
+ * check商家/店铺是否有效
+ * @param userId
+ * @return
+ */
+ @GetMapping("/shop/checkStoreIsValid")
+ R checkStoreIsValid(@RequestParam("userId") Long userId);
+
+ /**
+ * 根据account查询微商业街商家信息
+ * @param account
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/getMcsMerchantByAccount")
+ R getMcsMerchantByAccount(@RequestParam("account") String account);
+
+ /**
+ * 完成订单更新/新增商家信息
+ * @param merchantName
+ * @param configId
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/updateAfterOrder")
+ R updateMcsMerchantAfterOrder(@RequestParam(value = "merchantName", required = false) String merchantName,
+ @RequestParam("configId") Long configId, @RequestParam("userId") Long userId);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/mcsOrder/queryAll")
+ R selectAllMscOrder(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/mcsOrder/{id}")
+ R selectOneMscOrder(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param mcsOrderVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/mcsOrder")
+ R insertMscOrder(@RequestBody McsOrderVO mcsOrderVO);
+
+ /**
+ * 修改数据
+ *
+ * @param mcsOrderVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/mcsOrder/update")
+ R updateMscOrder(@RequestBody McsOrderVO mcsOrderVO);
+
+ /**
+ * 微信支付
+ * @param mcsOrderVO
+ * @return
+ */
+ @PostMapping("/mcsOrder/wxPay")
+ R wxPayMscOrder(McsOrderVO mcsOrderVO);
+
+ /**
+ * 发送提醒短信
+ * @param id
+ * @return
+ */
+ @GetMapping("/mcsOrder/sendContent")
+ R sendContentMcsOrder(@RequestParam("id") Long id);
+
+ /**
+ *微信支付回调
+ * @param mcsOrderVO
+ * @return
+ */
+ @PostMapping("/mcsOrder/notify")
+ R notifyMcsOrder(@RequestBody McsOrderVO mcsOrderVO);
+
+ /**
+ * 验证码登录
+ * @param loginDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/loginWithPhone")
+ R loginWithPhone(@RequestBody LoginWithPhoneDTO loginDTO);
+
+ /**
+ * 首页顶部数据
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/index/topData")
+ R getMcsIndexTopData();
+
+ /**
+ * 戳戳卷领取
+ * @param gameId
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/coupon/apply")
+ R applyMcsCoupon(@RequestParam("gameId") Long gameId, @RequestParam("userId") Long userId);
+
+ /**
+ * h5分页查询戳戳资讯
+ * @param pageMcsInformationDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/information/pageH5")
+ R pageH5McsInfo(@RequestBody PageMcsInformationDTO pageMcsInformationDTO);
+
+ /**
+ * h5分页查询戳戳游戏
+ * @param pageMcsGameDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/game/pageH5")
+ R pageH5McsGame(@RequestBody PageMcsGameDTO pageMcsGameDTO);
+
+ /**
+ * 游戏详情
+ * @param gameId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/game/get")
+ R getMcsGame(@RequestParam("gameId") Long gameId);
+
+ /**
+ * 资讯详情
+ * @param infoId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/info/get")
+ R getMcsInfo(@RequestParam("infoId") Long infoId);
+
+ /**
+ * H5分页查询数字商业街商家
+ * @param pageMcsMerchantDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/merchant/pageH5")
+ R pageH5McsMerchant(@RequestBody PageMcsMerchantDTO pageMcsMerchantDTO);
+
+ /**
+ * 我的戳戳卷
+ * @param type
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/myCoupon")
+ R getMyCoupon(@RequestParam(value = "type", required = false) Integer type, @RequestParam("userId") Long userId);
+
+ /**
+ * 新增评价记录
+ * @param mcsEvaluateDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/evaluate/add")
+ R addMcsEvaluate(@RequestBody McsEvaluateDTO mcsEvaluateDTO);
+
+ /**
+ * 我的评价-参与游戏列表
+ * @param pageJoinGameListDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/joinGame/page")
+ R getJoinGameList(@RequestBody PageJoinGameListDTO pageJoinGameListDTO);
+
+ /**
+ * 戳戳卷核销
+ * @param couponId
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/coupon/verify")
+ R verifyMcsCoupon(@RequestParam("couponId") Long couponId, @RequestParam("userId") Long userId);
+
+ /**
+ * 分页查询核销记录
+ * @param pageVerifyRecordDTO
+ * @return
+ */
+ @PostMapping("/microcommercialstreet/verifyRecord/page")
+ R pageMcsVerifyRecord(@RequestBody PageVerifyRecordDTO pageVerifyRecordDTO);
+
+ /**
+ * 游戏统计
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/game/statistics")
+ R getMcsGameStatistics(@RequestParam("userId") Long userId);
+
+ /**
+ * 修改用戶信息
+ * @param putUserInfoDTO
+ * @return
+ */
+ @PutMapping("/microcommercialstreet/putUserInfo")
+ R putUserInfo(@RequestBody PutUserInfoDTO putUserInfoDTO);
+
+ /**
+ * 根据userId获取商家信息
+ * @param userId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/retrieveMcsMerchantInfoByUserId")
+ R retrieveMcsMerchantInfoByUserId(@RequestParam("userId") Long userId);
+
+ /**
+ * 定时任务-每隔5分钟执行一次，将已到期的微商业街商家旗下所有的游戏/资讯全部下架
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/offResourceForMcsMerchant")
+ R offResourceForMcsMerchant();
+
+ /**
+ * 获取产品信息详情
+ * @param productId
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/product/get")
+ R getMcsProduct(@RequestParam("productId") Long productId);
+
+ /**
+ * 定时任务-每隔5分钟执行一次，将已到期的微商业街游戏结束
+ * @return
+ */
+ @GetMapping("/microcommercialstreet/endStatusForMcsGame")
+ R endStatusForMcsGame();
+
+ @GetMapping("/reserve/record/delete")
+ R deleteRecord(@RequestParam("recordId")Long recordId);
+
+ /**
+ * 历史数据人员类型填充
+ * @param newVoList
+ * @param communityId
+ * @param userId
+ * @return
+ */
+ @PostMapping("/common/data/history/filled")
+ R filledPopulationPersonType(@RequestBody List<ComMngPopulationServeExcelVO> newVoList,
+ @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);
+
+ /**
+ * 根据小区id查询楼栋列表
+ * @param villageId 小区id
+ * @return 查询楼栋列表
+ */
+ @GetMapping("/building/getBuildListByVillageId")
+ R getBuildListByVillageId(@RequestParam(value = "villageId") Long villageId);
}
--
Gitblit v1.7.1