From a834326805b2ca86c54437a22bb41a23eceace3f Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Fri, 10 Nov 2023 18:08:43 +0800
Subject: [PATCH] Merge branch 'blnka' of http://120.27.238.55:7000/r/xc-mall into blnka
---
src/main/java/cc/mrbird/febs/mall/mapper/MallSalesmanMapper.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallSalesmanMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallSalesmanMapper.java
index 1983974..6959760 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallSalesmanMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallSalesmanMapper.java
@@ -1,10 +1,9 @@
package cc.mrbird.febs.mall.mapper;
import cc.mrbird.febs.mall.entity.MallAddressInfo;
+import cc.mrbird.febs.mall.entity.MallAgentRecord;
import cc.mrbird.febs.mall.entity.MallSalesman;
-import cc.mrbird.febs.mall.vo.AdminAgentSelectVo;
-import cc.mrbird.febs.mall.vo.AdminMallAddressInfoVo;
-import cc.mrbird.febs.mall.vo.AdminMallSalesmansTreeVo;
+import cc.mrbird.febs.mall.vo.*;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -28,4 +27,17 @@
Integer selectSumOrderCntByProvinceAndCity(@Param("province")String province, @Param("city")String city);
List<AdminMallAddressInfoVo> selectProvince();
+
+ IPage<AdminSalesmanAchieveVo> selectSalesmanAchieveListInPage(Page<AdminSalesmanAchieveVo> page, @Param("record")MallSalesman mallSalesman);
+
+ List<AdminSalesmanAchieveVo> selectSalesmanAchieveProvince();
+
+ List<AdminMemberOrderVo> selectAdminMemberOrderVoBySalesmanId(@Param("salesmanId")Long salesmanId);
+
+ IPage<AdminMallAgentRecordVo> selectAgentAchieveListInPage(Page<AdminMallAgentRecordVo> page, @Param("record")MallAgentRecord mallAgentRecord);
+
+ List<AdminMallAgentRecordVo> selectAgentAddressProvince();
+
+ List<String> selectAgentAddressCity(@Param("province")String province);
+
}
--
Gitblit v1.9.1