| | |
| | | @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); |
| | | } |
| | | |
| | | |
| | |
| | | @PostMapping("/VolunteerIntegralMerchant/insertVolunteer") |
| | | public R VolunteerIntegralMerchantInsertVolunteer(@RequestBody VolunteerIntegralMerchantVO vimVO) |
| | | { |
| | | if(StringUtils.isEmpty(vimVO.getMerchantId())) |
| | | { |
| | | return R.fail("商家id不能为空"); |
| | | } |
| | | |
| | | vimVO.setGoodType("1"); |
| | | return volunteerActivitiesPeople.VolunteerIntegralMerchantInsertVolunteer(vimVO); |
| | | } |
| | |
| | | @PostMapping("/VolunteerIntegralMerchant/updateById") |
| | | public R VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO) |
| | | { |
| | | if(StringUtils.isEmpty(vimVO.getMerchantId())) |
| | | { |
| | | return R.fail("商家id不能为空"); |
| | | } |
| | | |
| | | vimVO.setGoodType("1"); |
| | | return volunteerActivitiesPeople.VolunteerIntegralMerchantUpdateById(vimVO); |
| | | } |