mitao
2025-05-20 179c4d64313c9b7572778da4aaaf6c6584fe457d
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java
@@ -266,7 +266,7 @@
                                                @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);
    }
@@ -282,7 +282,7 @@
                                @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);
    }
@@ -294,6 +294,11 @@
    @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);
    }
@@ -301,6 +306,11 @@
    @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);
    }