From 84a3ef10e4219ad844e6ea86af65d8dec84f28d4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 04 Aug 2021 16:51:28 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

---
 gc-user/src/main/java/com/xzx/gc/user/mapper/AccountMapper.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/gc-user/src/main/java/com/xzx/gc/user/mapper/AccountMapper.java b/gc-user/src/main/java/com/xzx/gc/user/mapper/AccountMapper.java
index 5029c4f..6c0335f 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/mapper/AccountMapper.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/mapper/AccountMapper.java
@@ -9,6 +9,7 @@
 import com.xzx.gc.user.dto.DistribDataListDto;
 import com.xzx.gc.user.dto.DistribInfoListDto;
 import com.xzx.gc.user.dto.DistribListDto;
+import com.xzx.gc.user.dto.ExportDistribDataListDto;
 import com.xzx.gc.user.vo.*;
 import com.xzx.gc.util.GcMapper;
 import org.apache.ibatis.annotations.Param;
@@ -62,6 +63,20 @@
 
     List<JhyOrderItems> selectOrderById(@Param("orderId")Long orderId);
 
-    List<DistribDataListVo> distribDataList(DistribDataListDto distribDataListDto);
+    List<DistribDataListVo> distribDataList(@Param("record")DistribDataListDto distribDataListDto);
+
+    String selectOrderByHeadUserId(@Param("accountId")String accountId,@Param("record")DistribDataListDto distribDataListDto);
+
+    String selectJDSLByHeadUserId(@Param("accountId")String id,@Param("record")DistribDataListDto distribDataListDto);
+
+    DistribDataInfoVo selectDistribDataInfoVo();
+
+    List<DistribDataListVo> distribDataExport(@Param("record")ExportDistribDataListDto distribDataListDto);
+
+    String selectOrderExportByHeadUserId(@Param("accountId")String id, @Param("record")ExportDistribDataListDto distribDataListDto);
+
+    String selectJDSLExportByHeadUserId(@Param("accountId")String id, @Param("record")ExportDistribDataListDto distribDataListDto);
+
+    List<AccountInfo> selectAccountInfoByIds(@Param("list") List<String> list);
 }
 

--
Gitblit v1.9.1