Merge branch 'developer'

935090232@qq.com

2022-02-22 bbe0a2fd03063316e50cf141986bda984599bbda

 zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopActivitiesDao.java

@@ -1,11 +1,16 @@
package com.matrix.system.shopXcx.dao;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.system.activity.dto.ActivitiesListDto;
import com.matrix.system.activity.vo.ActivitiesListVo;
import com.matrix.system.shopXcx.api.vo.SalonVO;
import com.matrix.system.shopXcx.bean.ShopActivities;
import org.apache.ibatis.annotations.Param;

import java.util.List;
import java.util.Map;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.system.shopXcx.bean.ShopActivities;

/**
 * @description 活动主表
@@ -49,4 +54,11 @@
   public ShopActivities selectSalonActivityById(@Param("id") Long id);

   public List<ShopActivities> selectSalonActivityByUser(@Param("record") SalonVO salonVO);

   public IPage<ActivitiesListVo> findActivitiesList(Page<ActivitiesListVo> page, @Param("record")ActivitiesListDto activitiesListDto);

   public ShopActivities selectOneByCompanyIdAndActTypeAndActStatus(@Param("companyId")Long companyId, @Param("activitiesTypeSign")int activitiesTypeSign,
         @Param("actstatusStatusIng")int actstatusStatusIng);

   List<ShopActivities> selectOneByCompanyIdAndActType(@Param("companyId")Long companyId,@Param("activitiesTypeSign") int activitiesTypeSign);
}