From c8d237747918de7618c9bbd3ad21f782cee168ab Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 06 一月 2022 16:32:00 +0800
Subject: [PATCH] 商业街代码提交

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |  455 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 452 insertions(+), 3 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 880a211..951f74f 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
@@ -3,6 +3,23 @@
 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.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.community.microCommercialStreet.McsConfigVO;
+import com.panzhihua.common.model.vos.community.microCommercialStreet.McsOrderVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -246,6 +263,7 @@
 import com.panzhihua.common.model.vos.community.BatchhouseVO;
 import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
 import com.panzhihua.common.model.vos.community.ComActActRegistVO;
+import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
 import com.panzhihua.common.model.vos.community.ComActActivityVO;
 import com.panzhihua.common.model.vos.community.ComActAnnouncementVO;
 import com.panzhihua.common.model.vos.community.ComActColumnVO;
@@ -300,6 +318,7 @@
 import com.panzhihua.common.model.vos.community.ComSwRotaExcelVO;
 import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
 import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
+import com.panzhihua.common.model.vos.community.QRActivityCodeVO;
 import com.panzhihua.common.model.vos.community.ResetComActMessageVO;
 import com.panzhihua.common.model.vos.community.SignactivityVO;
 import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
@@ -1068,10 +1087,11 @@
      *
      * @param userId
      *            用户id
+     * @param status
      * @return 活动列表
      */
     @PostMapping("listactivity")
-    R listActivity(@RequestParam("userId") Long userId);
+    R listActivity(@RequestParam("userId") Long userId, @RequestParam(value = "status", required = false) Integer status);
 
     /**
      * 用户确认心愿
@@ -4941,6 +4961,14 @@
     R getWestCommunityLists();
 
     /**
+     * 综治app-小区列表
+     * @param villageListAppDTO 请求参数
+     * @return  小区列表
+     */
+    @PostMapping("/village/grid/list/app")
+    R getGridVillageListApp(@RequestBody ComMngVillageListAppDTO villageListAppDTO);
+
+    /**
      * 分页查询退役军人列表
      *
      * @param comExServicemanDTO
@@ -5293,11 +5321,11 @@
     R addIntegralTradeAdmin(@RequestBody AddComActIntegralUserDTO integralUserDTO);
 
     /**
-     * 根据社区活动id查询社区活动报名人员列表
+     * 根据社区活动id查询社区活动报名且未参与人员列表
      *
      * @param activityId
      *            活动id
-     * @return 社区活动报名人员列表
+     * @return 社区活动报名且未参与人员列表
      */
     @PostMapping("/integral/act/activity/admin")
     R getTaskActivityPeopleList(@RequestParam("activityId") Long activityId);
@@ -7007,6 +7035,22 @@
     R applyDonates(@RequestBody ComActWarehouseApplyDTO comActWarehouseApplyDTO);
 
     /**
+     * 生成二维码
+     * @param qrCodeVO
+     * @return
+     */
+    @PostMapping("/comActActivityCode/getQRCode")
+    public R getQRCode(@RequestBody QRActivityCodeVO qrCodeVO);
+
+    /**
+     * 重置二维码
+     * @param qrCodeVO
+     * @return
+     */
+    @PostMapping("/comActActivityCode/resetQRCode")
+    public R resetQRCode(@RequestBody QRActivityCodeVO qrCodeVO);
+
+    /**
      * 实有房屋数据修复定时任务
      * @return  实有房屋数据修复定时任务
      */
@@ -7129,6 +7173,48 @@
      */
     @PostMapping("/elders/pensionAuthRecord/add")
     R addPensionAuthRecordVO(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);
+    /**
+     * 活动报名签到情况
+     * @param id 活动主键id
+     * @return
+     */
+    @GetMapping("/activity/sign-in/list")
+    R listSignInRecord(@RequestParam("id") Long id);
+
+    /**
+     * 活动签到记录
+     * @param id 活动主键
+     * @param userId 用户id
+     * @return
+     */
+    @GetMapping("/activity/regist/list")
+    R listRegistRecord(@RequestParam("id")  Long id, @RequestParam("userId") Long userId);
+
+    /**
+     * 获取活动类型(目前只有志愿者活动需要获取)
+     * @param communityId
+     * @param type
+     * @return
+     */
+    @GetMapping("/activity/type/list")
+    R listActivityType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);
+
+    /**
+     * 添加活动类型
+     * @param comActActivityTypeVO
+     * @return
+     */
+    @PostMapping("/activity/type/add")
+    R addActivityType(@RequestBody ComActActivityTypeVO comActActivityTypeVO);
+
+    /**
+     * 我的评价
+     * @param userId
+     * @param activityId
+     * @return
+     */
+    @GetMapping("/activity/my-evaluate")
+    R listMyActivityEvaluate(@RequestParam("userId") Long userId, @RequestParam("activityId") Long activityId);
 
     /**
      * 分页查询居家隔离统计
@@ -7611,4 +7697,367 @@
      */
     @PostMapping("/screen/index/questionnaireList")
     R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO);
+
+    /**
+     * 首页二级页面-居民活动
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/screen/index/residentAct")
+    R indexResidentAct(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 首页二级页面-居民活动展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/screen/index/residentActList")
+    R indexResidentActList(@RequestBody PageBaseDTO pageBaseDTO);
+
+    /**
+     * 首页二级页面-志愿者活动
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/screen/index/volunteerAct")
+    R indexVolunteerAct(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 首页二级页面-志愿者活动展示列表
+     * @param pageBaseDTO
+     * @return
+     */
+    @PostMapping("/screen/index/volunteerActList")
+    R indexVolunteerActList(@RequestBody PageBaseDTO pageBaseDTO);
+
+    /**
+     * 新增数字商业街商家
+     * @param mcsMerchantDTO
+     * @return
+     */
+    @PostMapping("/microcommercialstreet/merchant/add")
+    R addMcsMerchant(@RequestBody McsMerchantDTO mcsMerchantDTO);
+
+    /**
+     * 编辑数字商业街商家
+     * @param mcsMerchantDTO
+     * @return
+     */
+    @PutMapping("/microcommercialstreet/merchant/put")
+    R putMcsMerchant(@RequestBody McsMerchantDTO mcsMerchantDTO);
+
+    /**
+     * 查询数字商业街商家详情
+     * @param merchantId
+     * @return
+     */
+    @GetMapping("/microcommercialstreet/merchant/get")
+    R getMcsMerchant(@RequestParam("merchantId") Long merchantId);
+
+    /**
+     * 删除数字商业街商家
+     * @param merchantId
+     * @param userId
+     * @return
+     */
+    @DeleteMapping("/microcommercialstreet/merchant/delete")
+    R deleteMcsMerchant(@RequestParam("merchantId") Long merchantId, @RequestParam("userId") Long userId);
+
+    /**
+     * 分页查询数字商业街商家
+     * @param pageMcsMerchantDTO
+     * @return
+     */
+    @PostMapping("/microcommercialstreet/merchant/page")
+    R pageMcsMerchant(@RequestBody PageMcsMerchantDTO pageMcsMerchantDTO);
+
+    /**
+     * 禁用/启用数字商业街商家
+     * @param disableOrEnableMcsMerchantDTO
+     * @return
+     */
+    @PutMapping("/microcommercialstreet/merchant/disable-or-enable")
+    R disableOrEnableMcsMerchant(@RequestBody DisableOrEnableMcsMerchantDTO disableOrEnableMcsMerchantDTO);
+
+    /**
+     * 获取所有数字商业街配置
+     * @return
+     */
+    @GetMapping("/microcommercialstreet/config/all")
+    R getAllMcsConfig();
+
+    /**
+     * 修改数字商业街配置
+     * @param configs
+     * @return
+     */
+    @PutMapping("/microcommercialstreet/config/put")
+    R putMcsConfig(@RequestBody List<McsConfigVO> configs);
+
+    /**
+     * 分页查询戳戳游戏
+     * @param pageMcsGameDTO
+     * @return
+     */
+    @PostMapping("/microcommercialstreet/game/page")
+    R pageMcsGame(@RequestBody PageMcsGameDTO pageMcsGameDTO);
+
+    /**
+     * 设为/取消游戏热门
+     * @param setPopularForGameDTO
+     * @return
+     */
+    @PutMapping("/microcommercialstreet/game/setPopular")
+    R setPopularForGame(@RequestBody SetPopularForGameDTO setPopularForGameDTO);
+
+    /**
+     * 上架/下架戳戳游戏
+     * @param setShelfForGameDTO
+     * @return
+     */
+    @PutMapping("/microcommercialstreet/game/setShelf")
+    R setShelfForGame(@RequestBody SetShelfForGameDTO setShelfForGameDTO);
+
+    /**
+     * 删除戳戳游戏
+     * @param gameId
+     * @param userId
+     * @return
+     */
+    @DeleteMapping("/microcommercialstreet/game/delete")
+    R deleteMcsGame(@RequestParam("gameId") Long gameId, @RequestParam("userId") Long userId);
+
+    /**
+     * 分页查询戳戳资讯
+     * @param pageMcsInformationDTO
+     * @return
+     */
+    @PostMapping("/microcommercialstreet/information/page")
+    R pageMcsInfo(@RequestBody PageMcsInformationDTO pageMcsInformationDTO);
+
+    /**
+     * 上架/下架戳戳资讯
+     * @param setShelfForInfoDTO
+     * @return
+     */
+    @PutMapping("/microcommercialstreet/information/setShelf")
+    R setShelfForMcsInfo(@RequestBody SetShelfForInfoDTO setShelfForInfoDTO);
+
+    /**
+     * 删除戳戳资讯
+     * @param infoId
+     * @param userId
+     * @return
+     */
+    @DeleteMapping("/microcommercialstreet/information/delete")
+    R deleteMcsInfo(@RequestParam("infoId") Long infoId, @RequestParam("userId") Long userId);
+
+    /**
+     * 分页查询评价记录
+     * @param pageMcsEvaluateDTO
+     * @return
+     */
+    @PostMapping("/microcommercialstreet/evaluate/page")
+    R pageMcsEvaluate(@RequestBody PageMcsEvaluateDTO pageMcsEvaluateDTO);
+
+    /**
+     * 查询评价记录详情
+     * @param evaluateId
+     * @return
+     */
+    @GetMapping("/microcommercialstreet/evaluate/get")
+    R getMcsEvaluate(@RequestParam("evaluateId") Long evaluateId);
+
+    /**
+     * 删除评价记录
+     * @param evaluateId
+     * @return
+     */
+    @DeleteMapping("/microcommercialstreet/evaluate/delete")
+    R deleteMcsEvaluate(@RequestParam("evaluateId") Long evaluateId);
+
+    /**
+     * 新增戳戳游戏
+     * @param mcsGameDTO
+     * @return
+     */
+    @PostMapping("/microcommercialstreet/game/add")
+    R addMcsGame(@RequestBody McsGameDTO mcsGameDTO);
+
+    /**
+     * 编辑戳戳游戏
+     * @param mcsGameDTO
+     * @return
+     */
+    @PutMapping("/microcommercialstreet/game/put")
+    R putMcsGame(@RequestBody McsGameDTO mcsGameDTO);
+
+    /**
+     * 发布戳戳游戏
+     * @param gameId
+     * @param userId
+     * @return
+     */
+    @GetMapping("/microcommercialstreet/game/publish")
+    R publishMcsGame(@RequestParam("gameId") Long gameId, @RequestParam("userId") Long userId);
+
+    /**
+     * 结束戳戳游戏
+     * @param gameId
+     * @param userId
+     * @return
+     */
+    @GetMapping("/microcommercialstreet/game/finish")
+    R finishMcsGame(@RequestParam("gameId") Long gameId, @RequestParam("userId") Long userId);
+
+    /**
+     * 戳戳游戏/资讯顶部统计数据
+     * @param type
+     * @param userId
+     * @return
+     */
+    @GetMapping("/microcommercialstreet/statistics/top")
+    R getTopStatistics(@RequestParam("type") Integer type, @RequestParam("userId") Long userId);
+
+    /**
+     * 新增戳戳资讯
+     * @param mcsInfoDTO
+     * @return
+     */
+    @PostMapping("/microcommercialstreet/information/add")
+    R addMcsInfo(@RequestBody McsInfoDTO mcsInfoDTO);
+
+    /**
+     * 编辑戳戳资讯
+     * @param mcsInfoDTO
+     * @return
+     */
+    @PutMapping("/microcommercialstreet/information/put")
+    R putMcsInfo(@RequestBody McsInfoDTO mcsInfoDTO);
+
+    /**
+     * 发布戳戳资讯
+     * @param infoId
+     * @param userId
+     * @return
+     */
+    @GetMapping("/microcommercialstreet/information/publish")
+    R publishMcsInfo(@RequestParam("infoId") Long infoId, @RequestParam("userId") Long userId);
+
+    /**
+     * 新增产品信息
+     * @param mcsProductDTO
+     * @return
+     */
+    @PostMapping("/microcommercialstreet/product/add")
+    R addMcsProduct(@RequestBody McsProductDTO mcsProductDTO);
+
+    /**
+     * 编辑产品信息
+     * @param mcsProductDTO
+     * @return
+     */
+    @PutMapping("/microcommercialstreet/product/put")
+    R putMcsProduct(@RequestBody McsProductDTO mcsProductDTO);
+
+    /**
+     * 删除产品信息
+     * @param productId
+     * @param userId
+     * @return
+     */
+    @DeleteMapping("/microcommercialstreet/product/delete")
+    R deleteMcsProduct(@RequestParam("productId") Long productId, @RequestParam("userId") Long userId);
+
+    /**
+     * 上架/下架产品信息
+     * @param setShelfForProductDTO
+     * @return
+     */
+    @PutMapping("/microcommercialstreet/product/setShelf")
+    R setShelfForMcsProduct(@RequestBody SetShelfForProductDTO setShelfForProductDTO);
+
+    /**
+     * 分页查询产品信息
+     * @param pageMcsProductDTO
+     * @return
+     */
+    @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);
+
+    /**
+     * 分页查询所有数据
+     *
+     * @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);
 }

--
Gitblit v1.7.1