mitao
2025-05-20 179c4d64313c9b7572778da4aaaf6c6584fe457d
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;
@@ -167,7 +168,7 @@
    public R volunteerTypeGetList(@RequestParam("pageNum")  int pageNum,
                                  @RequestParam("pageSize")  int pageSize)
    {
        return volunteerActivitiesPeople.volunteerTypeGetList(pageNum,pageSize);
        return volunteerActivitiesPeople.volunteerTypeGetList(pageNum,pageSize,"1");
    }
    /**************************************************************************************************
@@ -262,13 +263,71 @@
    @GetMapping("/VolunteerIntegralMerchant/queryList")
    public R VolunteerIntegralMerchantQueryList(@RequestParam("pageNum") int pageNum,
                                                @RequestParam("pageSize")  int pageSize,
                                                @RequestParam("name")  String name,
                                                @RequestParam("state")  String state)
                                                @RequestParam(value = "name", required = false) String name,
                                                @RequestParam(value = "state", required = false) String state)
    {
        return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state);
        return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state,"0",null);
    }
    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/VolunteerIntegralMerchant/merchantQueryList")
    public R MerchantQueryList(@RequestParam("pageNum") int pageNum,
                                @RequestParam("pageSize")  int pageSize,
                                @RequestParam(value = "name", required = false) String name,
                                @RequestParam(value = "state", required = false) String state,
                                @RequestParam(value = "merchantId", required = false) String merchantId)
    {
        return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state,"1",merchantId);
    }
    /**
     * 新增
     * @param
     * @return
     */
    @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);
    }
    @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);
    }
}