| | |
| | | { |
| | | communityId=getCommunityId()+""; |
| | | } |
| | | |
| | | String userId=null; |
| | | |
| | | if(StringUtils.isEmpty(merchantId)) |
| | | { |
| | | userId=getUserId()+""; |
| | | } |
| | | |
| | | return communityService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName, |
| | | condition,userName,communityId,getUserId()+"",orderType,merchantId); |
| | | condition,userName,communityId,userId,orderType,merchantId); |
| | | } |
| | | |
| | | /** |
| | |
| | | } |
| | | |
| | | |
| | | /******************************************************************************************************************* |
| | | * |
| | | * |
| | | * 社区折扣 |
| | | * |
| | | * |
| | | ******************************************************************************************************************/ |
| | | |
| | | /** |
| | | * 分页查询 |
| | | * @param |
| | | * @return |
| | | */ |
| | | @GetMapping("/community/discount/getList") |
| | | public R CommunityDiscountgetList(@RequestParam("communityId") String communityId) |
| | | { |
| | | return communityService.CommunityDiscountgetList(communityId); |
| | | } |
| | | |
| | | } |