| | |
| | | @RequestParam(value = "name", required = false) String name, |
| | | @RequestParam(value = "state", required = false) String state) |
| | | { |
| | | return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state,"1",null); |
| | | return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state,"0",null); |
| | | } |
| | | |
| | | |
| | |
| | | @RequestParam(value = "state", required = false) String state, |
| | | @RequestParam(value = "merchantId", required = false) String merchantId) |
| | | { |
| | | return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state,"2",merchantId); |
| | | return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state,"1",merchantId); |
| | | } |
| | | |
| | | |
| | |
| | | @RequestParam(value = "name", required = false) String name, |
| | | @RequestParam(value = "state", required = false) String state) |
| | | { |
| | | return merchantService.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state,"1",null); |
| | | return merchantService.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state,"0",null); |
| | | } |
| | | |
| | | /** |
| | |
| | | @RequestParam(value = "state", required = false) String state, |
| | | @RequestParam(value = "merchantId", required = true) String merchantId) |
| | | { |
| | | return R.ok(vtService.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state,"2",merchantId)); |
| | | return R.ok(vtService.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state,"1",merchantId)); |
| | | } |
| | | |
| | | /** |