| | |
| | | */ |
| | | @ApiOperation(value = "删除便民服务商家") |
| | | @DeleteMapping("/merchant/delete") |
| | | public R deleteMerchant(@RequestParam("merchantId") String merchantId, |
| | | @RequestParam("operator") String operator) { |
| | | return jinhuiCommunityService.deleteMerchant(merchantId, operator); |
| | | public R deleteMerchant(@RequestParam("merchantId") String merchantId) { |
| | | return jinhuiCommunityService.deleteMerchant(merchantId); |
| | | } |
| | | |
| | | /** |
| | |
| | | @ApiOperation(value = "商家评论列添加") |
| | | @PostMapping("/merchantEvaluate/addData") |
| | | public R merchantEvaluateAddData(@RequestBody JinghuiMerchantEvaluateVO item) { |
| | | item.setUserId(getUserId()+""); |
| | | return jinhuiCommunityService.merchantEvaluateAddData(item); |
| | | } |
| | | |
| | |
| | | JinhuiShoppingOrderVO vo=new JinhuiShoppingOrderVO(); |
| | | vo.setId(id); |
| | | vo.setCancelType("1"); |
| | | vo.setCancelTime(new Date()); |
| | | return jinhuiCommunityService.orderEditData(vo); |
| | | } |
| | | |
| | | |
| | | /****************************************************************************************************** |
| | | * |
| | | * 金汇文章 |
| | | * |
| | | *******************************************************************************************************/ |
| | | /** |
| | | * 分页查询 |
| | | * @param |
| | | * @return |
| | | */ |
| | | @ApiOperation(value = "金汇文章列表", response = JinhuiArticleManagementVO.class) |
| | | @GetMapping("/articleGetList") |
| | | public R articleGetList(@RequestParam("pageNum") int pageNum, |
| | | @RequestParam("pageSize") int pageSize) |
| | | { |
| | | return jinhuiCommunityService.articleGetList(pageNum,pageSize,"1"); |
| | | } |
| | | |
| | | /** |
| | | * 详情 |
| | | * @param id |
| | | * @return |
| | | */ |
| | | @ApiOperation(value = "金汇文章详情", response = JinhuiArticleManagementVO.class) |
| | | @GetMapping("/articleGetDetails") |
| | | public R articleGetDetails(@RequestParam("id") String id) |
| | | { |
| | | return jinhuiCommunityService.articleGetDetails(id); |
| | | } |
| | | |
| | | |
| | | |
| | | /************************************************************************************************************* |
| | | * |
| | | * 金汇体验活动 |
| | | * |
| | | ***************************************************************************************************************/ |
| | | /** |
| | | * 分页查询 |
| | | * |
| | | * @param |
| | | * @return |
| | | */ |
| | | @ApiOperation(value = "体验活动列表", response = JinhuiExperienceActivityVO.class) |
| | | @GetMapping("/experienceGetList") |
| | | public R experienceGetList(@RequestParam("pageNum") int pageNum, |
| | | @RequestParam("pageSize") int pageSize, |
| | | @RequestParam(value = "activityName", required = false) String activityName, |
| | | @RequestParam(value = "activityType", required = false) String activityType, |
| | | @RequestParam(value = "starTime", required = false) Date starTime, |
| | | @RequestParam(value = "endTime", required = false) Date endTime) |
| | | { |
| | | return jinhuiCommunityService.experienceGetList(pageNum,pageSize,activityName,activityType,starTime,endTime); |
| | | } |
| | | |
| | | /** |
| | | * 单个详情 |
| | | * @param id |
| | | * @return |
| | | */ |
| | | @ApiOperation(value = "体验活动单个详情", response = JinhuiExperienceActivityVO.class) |
| | | @GetMapping("/experienceGetDetails") |
| | | public R experienceGetDetails(@RequestParam("id") String id) |
| | | { |
| | | return jinhuiCommunityService.experienceGetDetails(id); |
| | | } |
| | | |
| | | |
| | | |
| | | |
| | | /******************************************************************************************************* |
| | | * |
| | | * 金汇报名体验 |
| | | * |
| | | *******************************************************************************************************/ |
| | | /** |
| | | * 分页查询 |
| | | * |
| | | * @param |
| | | * @return |
| | | */ |
| | | @ApiOperation(value = "金汇报名体验列表", response = JinhuiApplyExperienceVO.class) |
| | | @GetMapping("/applyExperienceGetList") |
| | | public R applyExperienceGetList(@RequestParam("pageNum") int pageNum, |
| | | @RequestParam("pageSize") int pageSize, |
| | | @RequestParam(value = "isFeedback", required = false) String isFeedback, |
| | | @RequestParam(value = "activityId", required = false) String activityId) |
| | | { |
| | | return jinhuiCommunityService.applyExperienceGetList(pageNum,pageSize,getUserId()+"",isFeedback,activityId); |
| | | } |
| | | |
| | | /** |
| | | * 详情 |
| | | * @param id |
| | | * @return |
| | | */ |
| | | @ApiOperation(value = "金汇报名体验详情", response = JinhuiApplyExperienceVO.class) |
| | | @GetMapping("/applyExperienceGetDetails") |
| | | public R applyExperienceGetDetails(@RequestParam("id") String id) |
| | | { |
| | | return jinhuiCommunityService.applyExperienceGetDetails(id,null,null); |
| | | } |
| | | |
| | | /** |
| | | * 新增 |
| | | * |
| | | * @param |
| | | * @return |
| | | */ |
| | | @ApiOperation(value = "金汇报名体验新增") |
| | | @PostMapping("/applyExperienceAddData") |
| | | public R applyExperienceAddData(@RequestBody JinhuiApplyExperienceVO item) |
| | | { |
| | | item.setUserId(getUserId()+""); |
| | | return jinhuiCommunityService.applyExperienceAddData(item); |
| | | } |
| | | |
| | | |
| | | /** |
| | | * 填写反馈接口 |
| | | * @return |
| | | */ |
| | | @ApiOperation(value = "金汇报名体验填写反馈接口") |
| | | @GetMapping("/applyExperienceFilIn") |
| | | public R filIn(@RequestParam("activityId") String activityId, |
| | | @RequestParam("content") String content) |
| | | { |
| | | return jinhuiCommunityService.filIn(getUserId()+"",activityId,content); |
| | | } |
| | | |
| | | } |