From 0a16ffd3e627278bc317109ef7102f5673a1242d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 12 Mar 2021 16:24:10 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java
index 01a7b54..3658015 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java
@@ -3,7 +3,12 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.matrix.system.fenxiao.dto.ShopSalesmanAppliingDto;
+import com.matrix.system.fenxiao.dto.ShopSalesmanApplyDto;
import com.matrix.system.fenxiao.entity.ShopSalesmanApply;
+import com.matrix.system.fenxiao.vo.ShopSalesmanAppliingVo;
+import com.matrix.system.fenxiao.vo.ShopSalesmanApplyVo;
+import com.matrix.system.shopXcx.vo.SalesmanVo;
import org.apache.ibatis.annotations.Param;
/**
@@ -13,6 +18,17 @@
*/
public interface ShopSalesmanApplyDao extends BaseMapper<ShopSalesmanApply> {
- IPage<ShopSalesmanApply> selectInvitationuserInPage(@Param("openId") String openId, Page<ShopSalesmanApply> page);
+ IPage<SalesmanVo> selectInvitationuserInPage(Page<SalesmanVo> page, @Param("openId") String openId, @Param("isSales")String isSales);
+
+ IPage<SalesmanVo> selectInvitationuserInPage(Page<SalesmanVo> page, @Param("openId") String openId);
+
+ IPage<ShopSalesmanApplyVo> findShopSalesmanApplyList(Page<ShopSalesmanApplyVo> page,
+ @Param("record")ShopSalesmanApplyDto shopSalesmanApplyDto);
+ //根据公司ID、审核状态、会员昵称查询对应的记录
+ IPage<ShopSalesmanAppliingVo> findShopSalesmanAppliingList(Page<ShopSalesmanAppliingVo> page,
+ @Param("record")ShopSalesmanAppliingDto shopSalesmanAppliingDto);
+
+ IPage<ShopSalesmanAppliingVo> selectBizUserApplyList(Page<ShopSalesmanAppliingVo> page,
+ @Param("record")ShopSalesmanAppliingDto shopSalesmanAppliingDto);
}
\ No newline at end of file
--
Gitblit v1.9.1