| | |
| | | import com.panzhihua.common.model.vos.jinhui.JinhuiShoppingOrderVO; |
| | | import com.panzhihua.common.model.vos.user.SysTemplateConfigVO; |
| | | import com.panzhihua.common.model.vos.user.SysUserNoticeVO; |
| | | import com.panzhihua.common.model.vos.user.SysUserVO; |
| | | import com.panzhihua.common.service.community.CommunityService; |
| | | import com.panzhihua.common.service.partybuilding.NewStriveForFeign; |
| | | import com.panzhihua.common.service.user.UserService; |
| | |
| | | @GetMapping("/getResourceSharingList") |
| | | public R getResourceSharingList(@RequestParam("pageNum") int pageNum, |
| | | @RequestParam("pageSize") int pageSize, |
| | | @RequestParam(value = "communityId", required = false)String communityId) |
| | | @RequestParam(value = "communityId", required = false)String communityId, |
| | | @RequestParam(value = "unitId", required = false)String unitId, |
| | | @RequestParam(value = "meritId", required = false) String meritId) |
| | | { |
| | | return newStriveForFeign.getResourceSharingList(pageNum,pageSize,communityId,null); |
| | | return newStriveForFeign.getResourceSharingList(pageNum,pageSize,communityId,unitId,meritId); |
| | | } |
| | | |
| | | @ApiOperation(value = "资源共享详情", response = NewFightResourceSharingDTO.class) |
| | |
| | | |
| | | |
| | | /** |
| | | * 每日签到记录列表 前15条 |
| | | * @return |
| | | */ |
| | | @ApiOperation(value = "每日签到记录列表 前15条", response = IntegratingTaskVO.class) |
| | | @GetMapping("/IntegratingTask/getEverydayList") |
| | | public R getEverydayList() |
| | | { |
| | | return newStriveForFeign.getEverydayList(getUserId()+"",getCommunityId()+""); |
| | | } |
| | | |
| | | |
| | | |
| | | /** |
| | | * 添加或者修改积分 |
| | | * @param item |
| | | * @return |
| | |
| | | @RequestParam(value = "orderNumber", required = false)String orderNumber, |
| | | @RequestParam(value = "goodName", required = false)String goodName, |
| | | @RequestParam(value = "name", required = false)String name, |
| | | @RequestParam(value = "cancelType", required = false)String cancelType) |
| | | @RequestParam(value = "cancelType", required = false)String cancelType, |
| | | @RequestParam(value = "merchantId", required = false) String merchantId, |
| | | @RequestParam(value = "orderType", required = false) String orderType) |
| | | { |
| | | return newStriveForFeign.orderGetList(pageNum,pageSize,userId,goodsId,orderNumber, |
| | | goodName,name,cancelType,getCommunityId()+""); |
| | | goodName,name,cancelType,getCommunityId()+"",merchantId,orderType); |
| | | } |
| | | |
| | | /** |
| | |
| | | @PostMapping("/orderAddData") |
| | | public R orderAddData(@RequestBody NewFightShoppingOrderVO item) |
| | | { |
| | | item.setCommunityId(getCommunityId()+""); |
| | | item.setUserId(getUserId()+""); |
| | | // item.setCommunityId(getCommunityId()+""); |
| | | // item.setUserId(getUserId()+""); |
| | | // item.setOrderType("1"); |
| | | return newStriveForFeign.orderAddData(item); |
| | | } |
| | | |
| | |
| | | } |
| | | |
| | | |
| | | @ApiOperation(value = "获取社区积分排名") |
| | | @GetMapping("/getIntegralUserRank") |
| | | public R getIntegralUserRank() |
| | | { |
| | | return communityService.getIntegralUserRank(getCommunityId(),getUserId()); |
| | | } |
| | | |
| | | |
| | | @ApiOperation(value = "是否是商家 如果是商家返回商家id") |
| | | @GetMapping("/selectUserBind") |
| | | public R selectUserBind() |
| | | { |
| | | return newStriveForFeign.selectUserBind(getCommunityId()+"",getUserId()+""); |
| | | } |
| | | |
| | | |
| | | |
| | | @ApiOperation(value = "搜索用户", response = SysUserVO.class) |
| | | @GetMapping("/selectUserList") |
| | | public R selectUserList(@RequestParam("phoneOrname") String phoneOrname) |
| | | { |
| | | return newStriveForFeign.selectUserList(getCommunityId()+"",phoneOrname); |
| | | } |
| | | |
| | | |
| | | } |