#feat .

yanghui

2022-11-28 42521c9b51c1bd9a40036f18fd610cd46601222d

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -3,18 +3,16 @@
import java.util.List;

import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
import com.panzhihua.common.model.dtos.community.DiscussVoteOptionDTO;
import com.panzhihua.common.model.dtos.community.PageActivityInviteDTO;
import com.panzhihua.common.model.dtos.community.PageVoteSituationDTO;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.acid.*;
import com.panzhihua.common.model.dtos.community.convenient.*;
import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
import com.panzhihua.common.model.dtos.community.enterprise.*;
import com.panzhihua.common.model.dtos.community.reserve.*;
import com.panzhihua.common.model.dtos.community.sanshuo.*;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
@@ -26,6 +24,7 @@
import com.panzhihua.common.model.dtos.neighbor.*;
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.civil.ComActSocialWorkerVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO;
@@ -35,6 +34,9 @@
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
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 io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -65,85 +67,6 @@
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerOrgTeamDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerServiceTypeDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerSkillDto;
import com.panzhihua.common.model.dtos.community.AddComActDynTypeDTO;
import com.panzhihua.common.model.dtos.community.AddIdentityAuthDTO;
import com.panzhihua.common.model.dtos.community.CancelRecordDTO;
import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
import com.panzhihua.common.model.dtos.community.ComActDiscussCommentDTO;
import com.panzhihua.common.model.dtos.community.ComActDiscussCommentUserDTO;
import com.panzhihua.common.model.dtos.community.ComActDiscussDTO;
import com.panzhihua.common.model.dtos.community.ComActDiscussOptionUserDTO;
import com.panzhihua.common.model.dtos.community.ComActDiscussUserDTO;
import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO;
import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO;
import com.panzhihua.common.model.dtos.community.ComCvtBusinessDTO;
import com.panzhihua.common.model.dtos.community.ComCvtCategoryDTO;
import com.panzhihua.common.model.dtos.community.ComCvtServeDTO;
import com.panzhihua.common.model.dtos.community.ComExServicemanDTO;
import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO;
import com.panzhihua.common.model.dtos.community.ComMngCarSaveDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationEditDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseAdminDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseEditAdminDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseInsertAdminDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseUserVO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
import com.panzhihua.common.model.dtos.community.ComMngRealCompanyBelongsDTO;
import com.panzhihua.common.model.dtos.community.ComOpsHouseDTO;
import com.panzhihua.common.model.dtos.community.ComPropertyPublicityDTO;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportEditDTO;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportHandleDTO;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportRectifyDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordAddDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordEditDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
import com.panzhihua.common.model.dtos.community.ComSwRotaPageDTO;
import com.panzhihua.common.model.dtos.community.ComSwRotaSaveDTO;
import com.panzhihua.common.model.dtos.community.ComSwSafetyWorkEditDTO;
import com.panzhihua.common.model.dtos.community.DisabledPersonsDTO;
import com.panzhihua.common.model.dtos.community.EditComActDynTypeDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthAddByFamilyDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthAddDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthDeleteDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthEditDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthElderlyDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthFeedbackAddDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthTypeQueryDTO;
import com.panzhihua.common.model.dtos.community.ExportComMngCarExcelDTO;
import com.panzhihua.common.model.dtos.community.ExportRealAssetsExcelDTO;
import com.panzhihua.common.model.dtos.community.ExportRealCompanyExcelDTO;
import com.panzhihua.common.model.dtos.community.GrantRewardDTO;
import com.panzhihua.common.model.dtos.community.KeyPersonInfoDTO;
import com.panzhihua.common.model.dtos.community.OperationDetailDTO;
import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
import com.panzhihua.common.model.dtos.community.PageComActDTO;
import com.panzhihua.common.model.dtos.community.PageComActDiscussCommentDTO;
import com.panzhihua.common.model.dtos.community.PageComActDiscussDTO;
import com.panzhihua.common.model.dtos.community.PageComActDynTypeDTO;
import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtBusinessAppletsDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtBusinessDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtCategoryDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtServeDTO;
import com.panzhihua.common.model.dtos.community.PageComEldersRecordsDTO;
import com.panzhihua.common.model.dtos.community.PageComMngCarDTO;
import com.panzhihua.common.model.dtos.community.PageComMngRealAssetsDTO;
import com.panzhihua.common.model.dtos.community.PageComMngRealCompanyDTO;
import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO;
import com.panzhihua.common.model.dtos.community.PageComPropertyPublicityDTO;
import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
import com.panzhihua.common.model.dtos.community.PageElderAuthRecordsDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthElderlyDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthHistoryDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthRecordDTO;
import com.panzhihua.common.model.dtos.community.PageIdentityAuthRecordDTO;
import com.panzhihua.common.model.dtos.community.PageQuestnaireAnswerDTO;
import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
import com.panzhihua.common.model.dtos.community.PageQuestnaireSubDetailsDTO;
import com.panzhihua.common.model.dtos.community.PageUserReserveDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
@@ -166,22 +89,6 @@
import com.panzhihua.common.model.dtos.community.cluster.admin.EditClusterMemberAdminDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.PageClusterAdminDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.PageClusterMemberAdminDto;
import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.ConvenientProductCategoryDTO;
import com.panzhihua.common.model.dtos.community.convenient.ConvenientProductDTO;
import com.panzhihua.common.model.dtos.community.convenient.ConvenientServiceCategoryDTO;
import com.panzhihua.common.model.dtos.community.convenient.DeleteConvenientProductDTO;
import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.ExportMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.OnShelfOrOffShelfProductDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageClassifyMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageConvenientProductCategoryDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageConvenientProductDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageConvenientServiceCategoryDTO;
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageSearchDTO;
import com.panzhihua.common.model.dtos.community.convenient.ResetPasswordConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.EditEasyPhotoActivityDTO;
@@ -299,27 +206,6 @@
import com.panzhihua.common.model.dtos.neighbor.DeleteNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO;
import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO;
import com.panzhihua.common.model.dtos.shop.ComShopCartDTO;
import com.panzhihua.common.model.dtos.shop.ComShopEditNubCartDTO;
import com.panzhihua.common.model.dtos.shop.ComShopFundsExportDTO;
import com.panzhihua.common.model.dtos.shop.ComShopGoodsDTO;
import com.panzhihua.common.model.dtos.shop.ComShopOrderCreateDTO;
import com.panzhihua.common.model.dtos.shop.ComShopOrderDeliverDTO;
import com.panzhihua.common.model.dtos.shop.ComShopOrderExportDTO;
import com.panzhihua.common.model.dtos.shop.ComShopOrderPreviewDTO;
import com.panzhihua.common.model.dtos.shop.ComShopOrderQueryDTO;
import com.panzhihua.common.model.dtos.shop.ComShopOrderShipDTO;
import com.panzhihua.common.model.dtos.shop.ComShopSysConfDTO;
import com.panzhihua.common.model.dtos.shop.OrderPayDTO;
import com.panzhihua.common.model.dtos.shop.PageComOrderListDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopAddressDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopFundsSearchDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopSysConfDTO;
import com.panzhihua.common.model.dtos.shop.WxPayNotifyOrderDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesByAdminDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAdminDTO;
@@ -430,6 +316,7 @@
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 org.springframework.web.multipart.MultipartFile;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -703,6 +590,19 @@
    R detailEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId") Long userId);

    /**
     * 随手拍详情
     *
     * @param id
     *            随手拍主键
     * @param userId
     *            登录用户id
     * @return 详情内容
     */
    @PostMapping("detaileasyphotodesensitize")
    R detailEasyPhotoDesensitize(@RequestParam("id") Long id, @RequestParam("userId") Long userId);


    /**
     * 随手拍删除
     *
     * @param id
@@ -733,6 +633,15 @@
     */
    @PostMapping("pagemicrowish/applets")
    R pageMicroWishApplets(@RequestBody ComActMicroWishVO comActMicroWishVO);
    /**
     * 小程序分页查询微心愿
     *
     * @param comActMicroWishVO
     *            查询参数
     * @return 分页集合
     */
    @PostMapping("pagemicrowish/appletsDesensitize")
    R pageMicroWishAppletsDesensitize(@RequestBody ComActMicroWishVO comActMicroWishVO);

    /**
     * 心愿详情
@@ -745,6 +654,17 @@
     */
    @PostMapping("detailmicrowish")
    R detailMicroWish(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
    /**
     * 心愿详情
     *
     * @param id
     *            查询主键
     * @param userId
     *            登录用户id
     * @return 心愿内容
     */
    @PostMapping("detailmicrowishdesensitize")
    R detailMicroWishDesensitize(@RequestParam("id") Long id, @RequestParam("userId") Long userId);

    /**
     * 审核、分配、反馈心愿
@@ -1278,7 +1198,7 @@
     * @return
     */
    @PostMapping("listadvertisement")
    R listAdvertisement();
    R listAdvertisement(@RequestParam("type") Integer type);

    /**
     * 新增广告
@@ -1427,6 +1347,17 @@
    R pageEasyPhotoApplets(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);

    /**
     * 小程序分页查询随手拍
     *
     * @param comActEasyPhotoVO
     *            查询参数
     * @return 返回结果
     */
    @PostMapping("pageeasyphotoappletsdesensitize")
    R pageEasyPhotoAppletsDesensitize(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);


    /**
     * 随手拍评论分页查询
     *
     * @param pageComActEasyPhotoCommentDTO
@@ -1435,6 +1366,16 @@
     */
    @PostMapping("pagecomacteasyphotocomment")
    R pageComActEasyPhotoComment(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO);

    /**
     * 随手拍评论分页查询 - 脱敏
     *
     * @param pageComActEasyPhotoCommentDTO
     *            查询参数
     * @return 查询结果
     */
    @PostMapping("pagecomacteasyphotocommentdesensitize")
    R pageComActEasyPhotoCommentDesensitize(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO);

    /**
     * 评论点赞/取消点赞
@@ -1601,6 +1542,15 @@
     */
    @PostMapping("pagediscussapplets")
    R pageDiscussApplets(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);
    /**
     * 议事投票-分页查询 小程序 -脱敏
     *
     * @param pageComActDiscussDTO
     *            查询参数
     * @return ComActDiscussVO 分页
     */
    @PostMapping("pagediscussappletsdesensitize")
    R pageDiscussAppletsDesensitize(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);

    /**
     * 议事投票-点赞、取消点赞
@@ -1623,6 +1573,16 @@
    R pageDiscussCommentApplets(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);

    /**
     * 议事投票-评论-分页查询 小程序 脱敏
     *
     * @param pageComActDiscussCommentDTO
     *            分页参数
     * @return ComActDiscussCommentVO
     */
    @PostMapping("pagediscusscommentappletsdesensitize")
    R pageDiscussCommentAppletsDesensitize(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);

    /**
     * 议事投票-详情 小程序
     *
     * @param id
@@ -1633,6 +1593,17 @@
     */
    @PostMapping("detaildiscussapplets")
    R detailDiscussApplets(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
    /**
     * 议事投票-详情 小程序
     *
     * @param id
     *            主键
     * @param userId
     *            登录用户主键
     * @return ComActDiscussVO
     */
    @PostMapping("detaildiscussappletsdesensitize")
    R detailDiscussAppletsDesensitize(@RequestParam("id") Long id, @RequestParam("userId") Long userId);

    /**
     * 议事投票-投票
@@ -2961,6 +2932,73 @@
     */
    @GetMapping("/shop/changeShopGoodsStatus")
    R changeStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status);

    /**
     * 商品列表-分页查询
     *
     * @param pageComShopGoodsDTO
     *            添加数据
     */
    @PostMapping("/shopFlower/pageGoods")
    R pageFlowerGoodsList(@RequestBody PageComShopFlowerGoodsDTO pageComShopGoodsDTO);

    /**
     * 商品列表-分页查询
     *
     * @param comShopFlowerGoodsDTO
     *            添加数据
     */
    @PostMapping("/shopFlower/pageShopFlowerGoodsByApp")
    R pageShopFlowerGoodsByApp(@RequestBody  ComShopFlowerGoodsDTO comShopFlowerGoodsDTO);


    /**
     * 新增商品
     *
     * @param addShopGoodsVO
     * @return
     */
    @PostMapping("/shopFlower/saveShopGoods")
    R saveFlowerShopGoods(@RequestBody AddShopFlowerGoodsVO addShopGoodsVO);

    /**
     * 编辑商品
     *
     * @param id
     * @param addShopGoodsVO
     * @return
     */
    @PostMapping("/shopFlower/editShopGoods/{id}")
    R editFlowerShopGoods(@PathVariable("id") Long id, @RequestBody AddShopFlowerGoodsVO addShopGoodsVO);

    /**
     * 删除商品
     *
     * @param goodsId
     * @return
     */
    @DeleteMapping("/shopFlower/deleteShopGoods")
    R deleteFlowerShopGoods(@RequestParam("goodsId") Long goodsId);

    /**
     * 修改商品状态
     *
     * @param id
     * @return
     */
    @GetMapping("/shopFlower/changeShopGoodsStatus")
    R changeFlowerStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status);

    /**
     * 商品详情
     *
     * @param goodsId
     * @return
     */
    @GetMapping("/shopFlower/shopGoodsDetail")
    R shopFlowerGoodsDetail(@RequestParam("goodsId") Long goodsId);



    /**
     * 结果
@@ -6503,6 +6541,14 @@
    R getMerchant(@RequestParam("merchantId") Long merchantId);

    /**
     * 获取便民服务商家详情
     * @param userId
     * @return
     */
    @GetMapping("/convenient/merchant/getMerchantByUserId")
    R getMerchantByUserId(@RequestParam("userId") Long userId);

    /**
     * 禁用/启用便民服务商家
     * @param disableOrEnableConvenientMerchantDTO
     * @return
@@ -6532,6 +6578,14 @@
     */
    @GetMapping("/convenient/getUserMerchantInfoByAccount")
    R<ConvenientMerchantVO> getUserMerchantInfoByAccount(@RequestParam("account") String account);

    /**
     * 获取用户便民服务商家详情
     * @param account 商家绑定账号
     * @return
     */
    @GetMapping("/convenient/getMerchantInfoByAccount")
    R<ConvenientMerchantVO> getMerchantInfoByAccount(@RequestParam("account") String account);

    /**
     * 获取商便民服务商家信息
@@ -10348,6 +10402,205 @@
    R batchCheck(@RequestBody BatchCheckAcidRecordDTO batchCheckAcidRecordDTO);

    /**
     * 小程序获取可用的行业中心列表
     * @return
     * */
    @GetMapping("/sanshuo/industryCenter/appletsList")
    R    industryCenterAppList();

    /**
     * 后台获取行业中心列表
     * */
    @GetMapping("/sanshuo/industryCenter/list")
    R backIndustrytList(@RequestParam(value = "keyWord",required = false)String keyWord,
                       @RequestParam(value = "page",required = false)Integer page,
                       @RequestParam(value = "size",required = false)Integer size);

    /**
     * 添加业务中心
     * */
    @PostMapping("/sanshuo/industryCenter")
    R addIndustry(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO);

    /**
     * 修改业务中心
     * */
    @PutMapping("/sanshuo/industryCenter")
    R updateIndustry(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO);

    /**
     * 删除业务中心
     * */
    @DeleteMapping("/sanshuo/industryCenter/remove")
    R removeIndustry(@RequestParam("id") Long id);

    /**
     * 重置业务中心密码
     * */
    @PostMapping("/sanshuo/industryCenter/resetPass")
    R resetIndustryPassword(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO);

    /**
     * 业务中心详情
     * */
    @GetMapping("/sanshuo/industryCenter/detail")
    R industryCenterDetail(@RequestParam("id") Long id);

    /**
     * 后台获取专家列表
     * */
    @GetMapping("/sanshuo/expert/backstageList")
    R backExpertList(@RequestParam(value = "keyWord",required = false)@ApiParam("搜索关键字") String keyWord,
                     @RequestParam(value = "page",required = false)Integer page,
                     @RequestParam(value = "size",required = false)Integer size,
                     @RequestParam(value = "level",required = false)Integer level);

    /**
     * 添加专家
     * */
    @PostMapping("/sanshuo/expert")
    R addExpert(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO);

    /**
     * 修改专家
     * */
    @PutMapping("/sanshuo/expert")
    R updateExpert(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO);

    /**
     * 删除专家
     * */
    @DeleteMapping("/sanshuo/expert/remove")
    R removeExpert(@RequestParam("id")Long id);

    /**
     * 重置专家登陆密码
     * */
    @PostMapping("/sanshuo/expert/resetPassword")
    R resetExpertPassword(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO);

    /**
     * 小程序获取可选择专家列表
     * */
    @GetMapping("/sanshuo/expert/appletsList")
    R expertAppList(@RequestParam (value = "type",required = false)Integer type,@RequestParam(value = "id",required = false)Long id);

    /**
     * 获取专家详情
     * */
    @GetMapping("/sanshuo/expert/detail")
    R expertDetail(@RequestParam("id") Long id);

    /**
     * 后台事件列表
     * */
    @GetMapping("/sanshuo/event/list")
    R backEventList(@RequestParam(value = "keyWord",required = false)String keyWord,
                    @RequestParam(value = "page",required = false)Integer page,
                    @RequestParam(value = "size",required = false)Integer size);

    /**
     * 事件详情
     * */
    @GetMapping("/sanshuo/event/detail")
    R eventDetail(@RequestParam(value = "id",required = false)Long id);

    /**
     * 小程序获取事件列表
     * */
    @GetMapping("/sanshuo/event/appletsList")
    R eventAppList();

    /**
     * 新增事件类型
     * */
    @PostMapping("/sanshuo/event")
    R addEvent(@RequestBody ComMediateTypeDTO comSanshuoEventDTO);

    /**
     * 新增事件类型
     * */
    @PutMapping("/sanshuo/event")
    R updateEvent(@RequestBody ComMediateTypeDTO comSanshuoEventDTO);

    /**
     * 删除事件类型
     * */
    @DeleteMapping("/sanshuo/event/remove")
    R removeEvent(@RequestParam(value = "id",required = false)Long id);

    /**
     * 专家风采
     * */
    @GetMapping("/sanshuo/expert/expertShow")
    R expertShow();


    @GetMapping("/sanshuo/expert/expertRange")
    R expertRange();

    /**
     * 大屏事件统计
     * */
    @PostMapping("/sanshuo/comEvent/indexData")
    R sanshuoIndexDate(IndexDateDTO indexDateDTO);

    /**
     * 事件占比统计饼图
     * */
    @GetMapping("sanshuo/comEvent/indexData/event")
    R eventIndexData(@RequestParam("type") Integer type);

    /**
     * 专家风采列表
     * */
    @GetMapping("/sanshuo/expert/expertShowList")
    R expertShowList(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "id",required = false)Long id);

    /**
     * 修改街道信息
     * */
    @PostMapping("/updateStreet")
    R updateStreet(@RequestBody ComStreetVO comStreetVO);

    /**
     * 删除街道
     * */
    @GetMapping("/removeStreet")
    R removeStreet(@RequestParam(value = "id",required = false)Long id);

    /***
     * 删除社区
     * */
    @GetMapping("/removeCommunity")
    R removeCommunity(@RequestParam(value = "id",required = false)Long id);

    @PostMapping("/repassCommunity")
    R repassCommunity(@RequestBody ComActVO comActVO);

    @PostMapping("/repassStreet")
    R repassStreet(@RequestBody ComStreetVO comActVO);

    /**
     * 是否有绑定手机号码的专家账号
     * */
    @GetMapping("/sanshuo/expert/checkExpert")
    R isExpert(@RequestParam(value = "number",required = false) String number);

    @GetMapping("/sanshuo/comEvent/streetList")
    R streetList();

    @PostMapping("/sanshuo/expert/importExpert")
    R importExpert(@RequestBody MultipartFile file);

    @GetMapping("/sanshuo/comEvent/communityList")
    R westList();

    @GetMapping("/sanshuo/expert/backstageList2")
    R expertBackStageList(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "page",required = false)Integer page,
                          @RequestParam(value = "size",required = false)Integer size,@RequestParam(value = "keyWord",required = false)String  keyWord);

    /**
     * 查询社区id集合
     * @param id
     * @return
@@ -10362,4 +10615,500 @@
     */
    @GetMapping("selectAutomessageSysUserById")
    R selectAutomessageSysUserById(@RequestParam("id") Long id);

    /**
     * 分页查询议事委员会列表
     * */
    @GetMapping("/proceedings/list")
    R proceedingsList(@RequestParam(value = "page",required = false) Integer page,
                      @RequestParam(value = "size",required = false) Integer size,
                      @RequestParam(value = "keyWord",required = false) String keyWord);
    /**
     * 添加或修改议事委员会
     * */
    @PostMapping("/proceedings")
    R addOrUpdateProceedings(@RequestBody ComActProceedingsDTO comActProceedingsDTO);

    /**
     * 自提点分页查询
     * @param pageConvenientElevatingPointDTO
     * @return
     */
    @PostMapping("/convenient/point/page")
    R pagePoint(PageConvenientElevatingPointDTO pageConvenientElevatingPointDTO);

    /**
     * 新增自提点
     * @param convenientElevatingPointDTO
     * @return
     */
    @PostMapping("/convenient/point/add")
    R addPoint(ConvenientElevatingPointDTO convenientElevatingPointDTO);

    /**
     * 编辑自提点
     * @param convenientElevatingPointDTO
     * @return
     */
    @PutMapping("/convenient/point/put")
    R putPoint(ConvenientElevatingPointDTO convenientElevatingPointDTO);

    /**
     * 删除便民服务 自提点
     * @param pointId
     * @param operator
     * @return
     */
    @DeleteMapping("/convenient/point/delete")
    R deletePoint(@RequestParam("pointId") Long pointId, @RequestParam("operator") Long operator);

    /**
     * 便民服务详情 自提点
     * @param pointId
     * @return
     */
    @GetMapping("/convenient/point/detail")
    R detailPoint(@RequestParam("pointId") Long pointId);

    /**
     * 新增商品分类
     * @param convenientGoodsCategoryDTO
     * @return
     */
    @PostMapping("/convenient/goodsCategory/add")
    R addGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO);

    /**
     * 编辑
     * @param convenientGoodsCategoryDTO
     * @return
     */
    @PutMapping("/convenient/goodsCategory/put")
    R putGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO);

    /**
     * 删除商品分类
     * @param categoryId
     * @return
     */
    @DeleteMapping("/convenient/goodsCategory/delete")
    R deleteGoodsCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator);

    /**
     * 获取商品分类详情
     * @param categoryId
     * @return
     */
    @GetMapping("/convenient/goodsCategory/get")
    R getGoodsCategory(@RequestParam("categoryId") Long categoryId);

    /**
     * 分页查询商品分类
     * @param pageConvenientGoodsCategoryDTO
     * @return
     */
    @PostMapping("/convenient/goodsCategory/page")
     R pageGoodsCategory(@RequestBody PageConvenientGoodsCategoryDTO pageConvenientGoodsCategoryDTO);

    @GetMapping("/dataCount")
    R dataCount();

    @DeleteMapping("/proceedings/remove")
    R removeProceedings(@RequestParam("id") Long id);

    /**
     * 获取物业公司通知公告列表
     * */
    @GetMapping("comProperty/noticeList")
    R noticeList(@RequestParam("page")Integer page,@RequestParam("size")Integer size,@RequestParam("propertyId")Long propertyId);

    /**
     * 获取所有商品分类
     * @return
     */
    @GetMapping("/convenient/goodsCategory/getAllGoodsCategories")
    R getAllGoodsCategories();

    /**
     * 分页查询用户收货地址列表
     *
     * @param comShopAddressDTO
     *            请求参数
     * @return 用户收货地址列表
     */
    @PostMapping("/shopFlower/shopUserAddressList")
    R shopFlowerUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO);

    /**
     * 用户添加收货地址
     *
     * @param comShopAddressDTO
     *            请求参数
     * @return 添加结果
     */
    @PostMapping("/shopFlower/shopAddUserAddress")
    R shopFlowerAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);

    /**
     * 用户修改收货地址
     *
     * @param comShopAddressDTO
     *            请求参数
     * @return 修改结果
     */
    @PostMapping("/shopFlower/shopEditUserAddress")
    R shopFlowerEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);

    /**
     * 用户删除收货地址
     *
     * @param addressId
     *            收货地址id
     * @return 删除结果
     */
    @DeleteMapping("/shopFlower/shopDelUserAddress")
    R shopFlowerDelUserAddress(@RequestParam("addressId") Long addressId);

    /**
     * 订单预览
     *
     * @param orderPreviewDTO 请求参数
     * @return 订单预览数据
     */
    @PostMapping("/shopFlower/orderPreview")
    R orderPreviewFlower(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO);

    /**
     * 创建订单
     *
     * @param orderCreateDTO 创建订单请求参数
     * @return 创建结果
     */
    @PostMapping("/shopFlower/orderCreate")
    R orderCreateFlower(@RequestBody ComShopOrderCreateDTO orderCreateDTO);

    /**
     * 分页查询用户订单列表
     *
     * @param comOrderListDTO 请求参数
     * @return 查询结果
     */
    @PostMapping("/shopFlower/pageOrderList")
    R pageOrderListFlower(@RequestBody PageComFlowerOrderListDTO comOrderListDTO);

    /**
     * 根据订单id查询订单详情
     *
     * @param orderId 订单id
     * @return 订单详情
     */
    @GetMapping("/shopFlower/orderDetail")
    R orderDetailFlower(@RequestParam("orderId") Long orderId,@RequestParam(value = "phone",required = false) String phone);

    /**
     * 根据订单id取消订单
     *
     * @param comShopOrderQueryDTO 请求参数
     * @return 取消结果
     */
    @PostMapping("/shopFlower/orderCancel")
    R orderCancelFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);

    /**
     * 根据订单id删除订单
     *
     * @param orderId 订单id
     * @return 删除结果
     */
    @DeleteMapping("/shopFlower/orderDelete")
    R orderDeleteFlower(@RequestParam("orderId") Long orderId);

    /**
     * 根据订单id确认收货
     *
     * @param comShopOrderQueryDTO 请求参数
     * @return 确认结果
     */
    @PostMapping("/shopFlower/orderConfirm")
    R orderConfirmFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);

    /**
     * 分页查询 商家订单
     *
     * @param pageComShopOrderSearchDTO 分页数据
     * @return 分页订单
     */
    @PostMapping("/shopFlower/order/page")
    R pageShopOrderFlower(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
    /**
     * 订单发货
     *
     * @param orderShipDTO 发货信息
     * @return 发货结果
     */
    @PostMapping("/shopFlower/shipOrder")
    R shipOrderFlower(@RequestBody ComShopOrderShipDTO orderShipDTO);

    /**
     * 订单配送
     *
     * @param deliverDTO 订单ID
     * @return 配送结果
     */
    @PostMapping("/shopFlower/deliverOrder")
    R deliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO);

    /**
     * 订单配送
     *
     * @param deliverDTO 订单ID
     * @return 配送完成
     */
    @PostMapping("/shopFlower/finishDeliverOrder")
    R finishDeliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO);

    /**
     * 获取当前商铺周围的自提点信息以及距离手机距离
     *
     * @param merchantId
     * @return
     */
    @GetMapping("/convenient/point/findPointByMerchantId")
    R findPointByMerchantId(@RequestParam("merchantId") Long merchantId, @RequestParam("lat") String lat, @RequestParam("lng") String lng);

    /**
     * 保存评价
     * @param comShopFlowerEvaluateDTO
     * @return
     */
    @PostMapping("/shopFlower/saveEvaluate")
    R saveEvaluate(@RequestBody ComShopFlowerEvaluateDTO comShopFlowerEvaluateDTO);

    /**
     * 分页查询评价
     * @param pageComShopFlowerEvaluateDTO
     * @return
     */
    @PostMapping("/shopFlower/pageEvaluate")
    R pageEvaluate(@RequestBody PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO);

    /**
     * 评价详情
     * @param id
     * @return
     */
    @GetMapping("/shopFlower/detailEvaluate")
    R detailEvaluate(@RequestParam("id") Long id);

    /**
     * 删除评价
     * @param id
     * @return
     */
    @DeleteMapping("/shopFlower/deleteEvaluate")
    R deleteEvaluate(@RequestParam("id") Long id);

    /**
     * 取货码
     * @param id
     * @return
     */
    @ApiOperation(value = "取货码")
    @GetMapping("/shopFlower/getQRCode")
    R getQRCode(@RequestParam("id") Long id);

    /**
     * 保存配送单
     * @param comShopFlowerOrderDeliveryDTO
     */
    @PostMapping("/shopFlower/saveDelivery")
    R saveDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO);

    /**
     * 更新配送单
     * @param comShopFlowerOrderDeliveryDTO
     */
    @PostMapping("/shopFlower/updateDelivery")
    R updateDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO);

    /**
     * 已配送、已送达 分页查询
     * @param pageComFlowerOrderDeliveryDTO
     * @return
     */
    @PostMapping("/shopFlower/pageDelivery")
    R pageDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO);

    /**
     * 未配送 分页查询
     * @param pageComFlowerOrderDeliveryDTO
     * @return
     */
    @PostMapping("/shopFlower/pageNoDelivery")
    R pageNoDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO);

    /**
     * 未配送-开始配送-订单列表
     * @param pageComFlowerOrderListDTO
     * @return
     */
    @PostMapping("/shopFlower/pageNoDeliveryOrderList")
    R pageNoDeliveryOrderList(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO);

    /**
     * 根据商家id查询商家的订单
     * @param pageComFlowerOrderListDTO
     * @return
     */
    @PostMapping("/shopFlower/pageOrderByStoreId")
    R pageOrderByStoreId(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO);

    /**
     * 微信支付订单回调
     *
     * @param wxPayNotifyOrderDTO
     *            订单支付回调参数
     */
    @PostMapping("/shopFlower/wxOrderPayNotify")
    void wxOrderPayNotifyFlower(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO);

    /**
     * 点击去支付订单
     *
     * @param orderPayDTO
     *            请求参数
     * @return 支付对象
     */
    @PostMapping("/shopFlower/wxPay")
    R wxPayFlower(@RequestBody OrderPayDTO orderPayDTO);

    /**
     * 获取社区动态置顶banner
     * @param communityId  社区id
     * */
    @PostMapping("/easyphoto/getUserRewardsNew")
    R getUserRewardsNew(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);

    /**
     * 统计查询订单数量
     * @param deliveryType
     * @param userId
     * @return
     */
    @GetMapping("/shopFlower/selectCountByDeliveryType")
    R selectCountByDeliveryType(@RequestParam("deliveryType") Integer deliveryType,@RequestParam("userId")  Long userId);

    /**
     * 查询我的店铺各类统计数据
     * @param userId
     * @return
     */
    @GetMapping("/shopFlower/selectCountByUserId")
    R selectCountByUserId(@RequestParam("userId") Long userId);


    /**
     * 创建退款订单
     * @param comShopFlowerRefundOrderDTO
     * @return
     */
    @PostMapping("/shopFlower/createRefundOrder")
    R createRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO);

    /**
     * 分页查询
     * @param pageComOrderRefundDTO
     * @return
     */
    @PostMapping("/shopFlower/pageRefundOrder")
    R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO);

    /**
     * 修改退款订单
     * @param comShopFlowerRefundOrderDTO
     * @return
     */
    @PostMapping("/shopFlower/updateRefundOrder")
    R updateRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO);


    /**
     * 商家后台-退款申请统计
     * @param storeId
     * @return
     */
    @GetMapping("/shopFlower/selectCountGroupStatus")
    R selectCountGroupStatus(@RequestParam("storeId") Long storeId);

    /**
     * 新增商品浏览量
     * @param goodsId
     * @return
     */
    @GetMapping("/shopFlower/incrGoodsView")
    R incrGoodsView(@RequestParam("goodsId") Long goodsId);

    /**
     * 出入账分页
     * @param pageComShopFlowerOrderPayDTO
     * @return
     */
    @PostMapping("/shopFlower/pageOrderPay")
    R pageOrderPay(@RequestBody PageComShopFlowerOrderPayDTO pageComShopFlowerOrderPayDTO);

    /**
     * 获取商家的营业额和可结算金额
     * @param storeId
     * @return
     */
    @GetMapping("/shopFlower/getQuota")
    R getQuota(@RequestParam("storeId") Long storeId);

    /**
     * 取消退款
     * @param id
     * @return
     */
    @GetMapping("/shopFlower/refundOrderCancel")
    R refundOrderCancel(@RequestParam("id") Long id);

    /**
     * 退款订单详情
     * @param id
     * @return
     */
    @GetMapping("/shopFlower/refundOrderDetail")
    R refundOrderDetail(@RequestParam("id") Long id);

    /**
     * 清点商品 确认送达详情
     * @param pageComFlowerOrderListDTO
     * @return
     */
    @PostMapping("/shopFlower/pageOrderByDeliveryNo")
    R pageOrderByDeliveryNo(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO);

    /**
     * 商家后台经营数据统计-上
     * @param storeId
     * @return
     */
    @GetMapping("/shopFlower/selectSumOrderAndAmountByStoreId")
    R selectSumOrderAndAmountByStoreId(@RequestParam("storeId") Long storeId);

    /**
     * 统计时间区域的订单量 15天 30天 一年
     * @param storeId
     * @param type
     * @return
     */
    @GetMapping("/shopFlower/selectOrderLineChart") R selectOrderLineChart(@RequestParam("storeId") Long storeId,@RequestParam("type")  Integer type,@RequestParam("tab")  Integer tab);

    /**
     * 统计上架的上下架商品数量
     * @param userId
     * @return
     */
    @GetMapping("/shopFlower/countSaleByUserId")
    R countSaleByUserId(@RequestParam("userId") Long userId);
}