| | |
| | | @RequestParam(value = "orderNumber", required = false) String orderNumber, |
| | | @RequestParam(value = "goodsName", required = false) String goodsName, |
| | | @RequestParam(value = "condition", required = false) String condition, |
| | | @RequestParam(value = "userName", required = false) String userName) |
| | | @RequestParam(value = "userName", required = false) String userName, |
| | | @RequestParam(value = "communityId", required = false) String communityId) |
| | | { |
| | | |
| | | if(StringUtils.isEmpty(communityId)) |
| | | { |
| | | communityId=getCommunityId()+""; |
| | | } |
| | | return communityService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName, |
| | | condition,userName,null,getLoginUserInfo().getUserId()+"","1"); |
| | | condition,userName,communityId,getLoginUserInfo().getUserId()+"","1"); |
| | | } |
| | | |
| | | /** |
| | |
| | | @RequestParam(value = "orderNumber", required = false) String orderNumber, |
| | | @RequestParam(value = "goodsName", required = false) String goodsName, |
| | | @RequestParam(value = "condition", required = false) String condition, |
| | | @RequestParam(value = "userName", required = false) String userName) |
| | | @RequestParam(value = "userName", required = false) String userName, |
| | | @RequestParam(value = "communityId", required = false) String communityId) |
| | | { |
| | | if(StringUtils.isEmpty(communityId)) |
| | | { |
| | | communityId=getCommunityId()+""; |
| | | } |
| | | return merchantService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName, |
| | | condition,userName,getCommunityId()+"",null,"1"); |
| | | condition,userName,communityId,null,"1"); |
| | | } |
| | | |
| | | /** |