Merge branch 'phs' into test

puhanshu

2022-01-12 10cc0db30a1be5377e4c09bce349014a667849b6

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

@@ -2,7 +2,7 @@

import java.util.List;

import com.panzhihua.common.model.dtos.PageBaseDTO;
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;
@@ -14,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;
@@ -153,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;
@@ -310,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;
@@ -330,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
@@ -7712,4 +7741,498 @@
     */
    @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 deleteProductDTO
     * @return
     */
    @PostMapping("/microcommercialstreet/product/delete")
    R deleteMcsProduct(@RequestBody DeleteProductDTO deleteProductDTO);

    /**
     * 上架/下架产品信息
     * @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);

    /**
     * 根据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);
}