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 |   40 ++++++++++++++++++++++++++++++++++------
 1 files changed, 34 insertions(+), 6 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 452b81f..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
@@ -1,21 +1,21 @@
 package com.xzx.gc.user.mapper;
 
 import com.xzx.gc.entity.AccountInfo;
+import com.xzx.gc.entity.JhyOrderItems;
 import com.xzx.gc.entity.OrderInfo;
 import com.xzx.gc.entity.ScoreDetails;
-import com.xzx.gc.entity.UserInfo;
 import com.xzx.gc.model.admin.AccountMoneyModel;
 import com.xzx.gc.model.admin.UserAccountModel;
-import com.xzx.gc.model.user.AccountReq;
-import com.xzx.gc.model.user.AccountVo;
-import com.xzx.gc.model.user.UserInfoVo;
-import com.xzx.gc.model.user.UserReq;
+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;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Map;
 
 @Repository
 public interface AccountMapper extends GcMapper<AccountInfo> {
@@ -50,5 +50,33 @@
     void insertScoreDetailsRet(ScoreDetails scoreDetailsRet);
 
     AccountInfo selectOneByUserId(@Param("userId")String userId);
+
+    List<DistribListVo> selectDsitribListByQueryCol(@Param("record")DistribListDto distribListDto);
+
+    List<DistribInfoListVo> selectDsitribInfoListByQueryCol(@Param("record")DistribInfoListDto distribInfoListDto);
+
+    ViewDistribInfoVo selectDistribByAccountId(@Param("id")String id);
+
+    List<UserHeadInfoVo> selectUserHeadInfoByAccountId(@Param("id")String id);
+
+    List<OrderItemsVo> selectOrderItemsByUserId(@Param("userId")String userId);
+
+    List<JhyOrderItems> selectOrderById(@Param("orderId")Long orderId);
+
+    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