From 7318cf8ef70e3817fb3d7af2ff919334aec4246b Mon Sep 17 00:00:00 2001
From: zyy <zyy@ oceanspot.onaliyun.com>
Date: Fri, 22 May 2020 20:42:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=B4=AD=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  6 +++++
 .../impl/PmnPromotionSrcServiceImpl.java      |  5 +---
 .../promotion/entity/PmnPromotionSrcVO.java   | 27 +++++++++++++++++++
 .../mapper/PmnPromotionSrcMapper.java         | 15 +++++++++++
 src/main/resources/application.yml            |  2 +-
 5 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/com/kiisoo/ic/promotion/entity/PmnPromotionSrcVO.java
 create mode 100644 src/main/java/com/kiisoo/ic/promotion/mapper/PmnPromotionSrcMapper.java

diff --git a/pom.xml b/pom.xml
index f410b33..7b85996 100644
--- a/pom.xml
+++ b/pom.xml
@@ -213,6 +213,12 @@
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>
             <version>1.2.5</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>mybatis-spring-boot-starter</artifactId>
+                    <groupId>org.mybatis.spring.boot</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!--pinyin 4j-->
diff --git a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java
index afc64a1..00b5336 100644
--- a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java
+++ b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java
@@ -50,6 +50,7 @@ import java.util.List;
  */
 @Service
 public class PmnPromotionSrcServiceImpl extends ServiceImpl<PmnPromotionSrcDOMapper, PmnPromotionSrc> implements IPmnPromotionSrcService {
+
     @Autowired
     private StoreEmployeeService storeEmployeeService;
     @Autowired
@@ -57,12 +58,8 @@ public class PmnPromotionSrcServiceImpl extends ServiceImpl<PmnPromotionSrcDOMap
     @Autowired
     private PoiStoreDOMapper poiStoreDOMapper;
     @Autowired
-    private PrivilageCpUserDOMapper privilageCpUserDOMapper;
-    @Autowired
     private IPmnActivityInstanceService pmnActivityInstanceService;
     @Autowired
-    private PrivilageCpUserStoreDOMapper privilageCpUserStoreDOMapper;
-    @Autowired
     private PrivilageUserDOMapper privilageUserDOMapper;
     @Autowired
     private PrivilageAccountService privilageAccountService;
diff --git a/src/main/java/com/kiisoo/ic/promotion/entity/PmnPromotionSrcVO.java b/src/main/java/com/kiisoo/ic/promotion/entity/PmnPromotionSrcVO.java
new file mode 100644
index 0000000..09b65d2
--- /dev/null
+++ b/src/main/java/com/kiisoo/ic/promotion/entity/PmnPromotionSrcVO.java
@@ -0,0 +1,27 @@
+package com.kiisoo.ic.promotion.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PmnPromotionSrcVO {
+
+    private String name;
+    private String staffCode;
+    private String mobile;
+    private String storeName;
+    private int type;
+    private String code;
+
+    /*
+     *分页总条数
+     */
+    @ApiModelProperty(value = "分页总条数", hidden = true)
+    private long totalSize;
+
+    /**序号*/
+    @ApiModelProperty(value = "序号", hidden = true)
+    private int number;
+
+
+}
diff --git a/src/main/java/com/kiisoo/ic/promotion/mapper/PmnPromotionSrcMapper.java b/src/main/java/com/kiisoo/ic/promotion/mapper/PmnPromotionSrcMapper.java
new file mode 100644
index 0000000..eb35913
--- /dev/null
+++ b/src/main/java/com/kiisoo/ic/promotion/mapper/PmnPromotionSrcMapper.java
@@ -0,0 +1,15 @@
+package com.kiisoo.ic.promotion.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kiisoo.ic.activity.entity.PmnPromotionSrc;
+import com.kiisoo.ic.promotion.entity.PmnPromotionSrcVO;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PmnPromotionSrcMapper extends BaseMapper<PmnPromotionSrc> {
+
+    List<PmnPromotionSrcVO> queryList(@Param("instanceId") Long instanceId, @Param("storeId") Long storeId);
+}
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 1c30771..556dec4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
 
 spring:
   profiles:
-    active: $profiles.active$
+    active: dev
   mvc:
     view:
       prefix: /