| | |
| | | import com.alibaba.fastjson.JSONObject; |
| | | import com.panzhihua.common.controller.BaseController; |
| | | import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO; |
| | | import com.panzhihua.common.model.dtos.community.convenient.JinhuiPageConvenientMerchantDTO; |
| | | import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO; |
| | | import com.panzhihua.common.model.vos.LoginUserInfoVO; |
| | | import com.panzhihua.common.model.vos.R; |
| | |
| | | */ |
| | | @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 = "分页查询便民服务商家", response = ConvenientMerchantVO.class) |
| | | @PostMapping("/merchant/page") |
| | | public R pageMerchant(@RequestBody PageConvenientMerchantDTO pageConvenientMerchantDTO) { |
| | | public R pageMerchant(@RequestBody JinhuiPageConvenientMerchantDTO pageConvenientMerchantDTO) |
| | | { |
| | | pageConvenientMerchantDTO.setAuditType("2"); |
| | | return jinhuiCommunityService.pageMerchant(pageConvenientMerchantDTO); |
| | | } |
| | | |
| | |
| | | @ApiOperation(value = "商家评论列添加") |
| | | @PostMapping("/merchantEvaluate/addData") |
| | | public R merchantEvaluateAddData(@RequestBody JinghuiMerchantEvaluateVO item) { |
| | | item.setUserId(getUserId()+""); |
| | | return jinhuiCommunityService.merchantEvaluateAddData(item); |
| | | } |
| | | |
| | |
| | | } |
| | | |
| | | |
| | | @ApiOperation(value = "订单核销") |
| | | @GetMapping("/orderCheck") |
| | | public R orderEditData(@RequestParam("id") String id) |
| | | { |
| | | |
| | | if(StringUtils.isEmpty(id)) |
| | | { |
| | | return R.fail("订单id不能为空"); |
| | | } |
| | | |
| | | 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); |
| | | } |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | } |