新增商家商品模块

lidongdong

2023-08-29 4ddc5fd15120f714780f63a3e178d2e4cce5b9ac

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerIntegralMerchantServiceImpl.java

@@ -3,15 +3,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.VolunteerIntegralMerchantVO;
import com.panzhihua.common.model.vos.community.VolunteerIntegralRecordVO;
import com.panzhihua.service_community.dao.VolunteerIntegralMerchantDao;
import com.panzhihua.service_community.dao.VolunteerIntegralRecordDao;
import com.panzhihua.service_community.entity.VolunteerIntegralMerchant;
import com.panzhihua.service_community.entity.VolunteerIntegralRecord;
import com.panzhihua.service_community.service.VolunteerIntegralMerchantService;
import com.panzhihua.service_community.service.VolunteerIntegralRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

@@ -28,8 +23,8 @@
    }

    @Override
    public IPage<VolunteerIntegralMerchant> queryList(Page page, String name, String state) {
        return baseMapper.queryList(page,name,state);
    public IPage<VolunteerIntegralMerchant> queryList(Page page, String name, String state,String goodType,String merchantId) {
        return baseMapper.queryList(page,name,state,goodType,merchantId);
    }

    @Override