springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java
@@ -3,6 +3,7 @@ import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.VolunteerActivitiesPeopleVO; import com.panzhihua.common.model.vos.community.VolunteerIntegralMerchantVO; import com.panzhihua.common.model.vos.community.VolunteerIntegralRecordVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.utlis.StringUtils; @@ -269,6 +270,38 @@ } /** * 新增 * @param * @return */ @PostMapping("/VolunteerIntegralMerchant/insertVolunteer") public R VolunteerIntegralMerchantInsertVolunteer(@RequestBody VolunteerIntegralMerchantVO vimVO) { vimVO.setGoodType("1"); return volunteerActivitiesPeople.VolunteerIntegralMerchantInsertVolunteer(vimVO); } @PostMapping("/VolunteerIntegralMerchant/updateById") public R VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO) { vimVO.setGoodType("1"); return volunteerActivitiesPeople.VolunteerIntegralMerchantUpdateById(vimVO); } @PostMapping("/VolunteerIntegralMerchant/unmount") public R VolunteerIntegralMerchantUnmount(@RequestBody VolunteerIntegralMerchantVO vimVO) { vimVO.setGoodType("1"); return volunteerActivitiesPeople.VolunteerIntegralMerchantUnmount(vimVO); } @DeleteMapping("/VolunteerIntegralMerchant/deleteById") public R VolunteerIntegralMerchantDeleteById(@RequestParam("id") String id) { return volunteerActivitiesPeople.VolunteerIntegralMerchantDeleteById(id); } } springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java
@@ -78,30 +78,6 @@ ***********************************************************************************************************/ /** * 分页查询 * @param * @return */ @GetMapping("order/getList") public R getList(@RequestParam("pageNum") int pageNum, @RequestParam("pageSize") int pageSize, @RequestParam(value = "goodsId", required = false) String goodsId, @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 = "communityId", required = false) String communityId) { if(StringUtils.isEmpty(communityId)) { communityId=getCommunityId()+""; } return communityService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName, condition,userName,communityId,getLoginUserInfo().getUserId()+"","1"); } /** * 查询详情 * @param id * @return @@ -212,7 +188,7 @@ /*********************************************************************************************************** * * * 订单兑换 * 商家订单兑换 * * ***********************************************************************************************************/ @@ -231,7 +207,7 @@ @RequestParam(value = "condition", required = false) String condition, @RequestParam(value = "userName", required = false) String userName, @RequestParam(value = "communityId", required = false) String communityId, @RequestParam(value = "communityId", required = false) String orderType) @RequestParam(value = "orderType", required = false) String orderType) { if(StringUtils.isEmpty(communityId)) { springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerMerchantApi.java
@@ -125,14 +125,14 @@ @PostMapping("/insertVolunteer") public R VolunteerIntegralMerchantInsertVolunteer(@RequestBody VolunteerIntegralMerchantVO vimVO) { vimVO.setGoodType("2"); vimVO.setGoodType("1"); return vtService.VolunteerIntegralMerchantInsertVolunteer(vimVO); } @PostMapping("/updateById") public R VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO) { vimVO.setGoodType("2"); vimVO.setGoodType("1"); return vtService.VolunteerIntegralMerchantUpdateById(vimVO); } @@ -140,7 +140,7 @@ @PostMapping("/unmount") public R VolunteerIntegralMerchantUnmount(@RequestBody VolunteerIntegralMerchantVO vimVO) { vimVO.setGoodType("2"); vimVO.setGoodType("1"); return vtService.VolunteerIntegralMerchantUnmount(vimVO); }