From 95f9ea7eb339c36cade6c67d0385c49ec2d81477 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 14 Apr 2021 19:39:45 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopActivitiesDao.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopActivitiesDao.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopActivitiesDao.java
index fc86fc5..d4a419b 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopActivitiesDao.java
+++ b/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,9 @@
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);
}
\ No newline at end of file
--
Gitblit v1.9.1