tij

Mall/Mall.Module.User/Class1.cs

-using System;
-
-namespace Mall.Module.User
-{
-    public class Class1
-    {
-    }
-}

Mall/Mall.Module.User/Mall.Module.User.csproj

@@ -4,4 +4,9 @@
     <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Mall.Model\Mall.Model.csproj" />
+    <ProjectReference Include="..\Mall.Repository\Mall.Repository.csproj" />
+  </ItemGroup>
+
 </Project>

Mall/Mall.Module.User/obj/Debug/netcoreapp3.0/Mall.Module.User.csproj.FileListAbsolute.txt

@@ -6,6 +6,7 @@ F:\工作\微途\外网代码\mall.oytour.com\Mall\Mall.Module.User\obj\Debug\ne
 F:\工作\微途\外网代码\mall.oytour.com\Mall\Mall.Module.User\obj\Debug\netcoreapp3.0\Mall.Module.User.AssemblyInfo.cs
 F:\工作\微途\外网代码\mall.oytour.com\Mall\Mall.Module.User\obj\Debug\netcoreapp3.0\Mall.Module.User.dll
 F:\工作\微途\外网代码\mall.oytour.com\Mall\Mall.Module.User\obj\Debug\netcoreapp3.0\Mall.Module.User.pdb
+<<<<<<< HEAD
 D:\project\GitProject\ShoppingMall\Mall\Mall.Module.User\bin\Debug\netcoreapp3.0\Mall.Module.User.deps.json
 D:\project\GitProject\ShoppingMall\Mall\Mall.Module.User\bin\Debug\netcoreapp3.0\Mall.Module.User.dll
 D:\project\GitProject\ShoppingMall\Mall\Mall.Module.User\bin\Debug\netcoreapp3.0\Mall.Module.User.pdb
@@ -15,3 +16,19 @@ D:\project\GitProject\ShoppingMall\Mall\Mall.Module.User\obj\Debug\netcoreapp3.0
 D:\project\GitProject\ShoppingMall\Mall\Mall.Module.User\obj\Debug\netcoreapp3.0\Mall.Module.User.AssemblyInfo.cs
 D:\project\GitProject\ShoppingMall\Mall\Mall.Module.User\obj\Debug\netcoreapp3.0\Mall.Module.User.dll
 D:\project\GitProject\ShoppingMall\Mall\Mall.Module.User\obj\Debug\netcoreapp3.0\Mall.Module.User.pdb
+=======
+F:\工作\微途\外网代码\mall.oytour.com\Mall\Mall.Module.User\bin\Debug\netcoreapp3.0\Mall.Common.dll
+F:\工作\微途\外网代码\mall.oytour.com\Mall\Mall.Module.User\bin\Debug\netcoreapp3.0\Mall.DataAccess.dll
+F:\工作\微途\外网代码\mall.oytour.com\Mall\Mall.Module.User\bin\Debug\netcoreapp3.0\Mall.DataHelper.dll
+F:\工作\微途\外网代码\mall.oytour.com\Mall\Mall.Module.User\bin\Debug\netcoreapp3.0\Mall.Model.dll
+F:\工作\微途\外网代码\mall.oytour.com\Mall\Mall.Module.User\bin\Debug\netcoreapp3.0\Mall.Repository.dll
+F:\工作\微途\外网代码\mall.oytour.com\Mall\Mall.Module.User\bin\Debug\netcoreapp3.0\Mall.Model.pdb
+F:\工作\微途\外网代码\mall.oytour.com\Mall\Mall.Module.User\bin\Debug\netcoreapp3.0\Mall.Repository.pdb
+F:\工作\微途\外网代码\mall.oytour.com\Mall\Mall.Module.User\bin\Debug\netcoreapp3.0\Mall.Common.pdb
+F:\工作\微途\外网代码\mall.oytour.com\Mall\Mall.Module.User\bin\Debug\netcoreapp3.0\Mall.DataAccess.pdb
+F:\工作\微途\外网代码\mall.oytour.com\Mall\Mall.Module.User\bin\Debug\netcoreapp3.0\Mall.DataHelper.pdb
+F:\工作\微途\外网代码\mall.oytour.com\Mall\Mall.Module.User\bin\Debug\netcoreapp3.0\en-us\Mall.Common.resources.dll
+F:\工作\微途\外网代码\mall.oytour.com\Mall\Mall.Module.User\bin\Debug\netcoreapp3.0\zh-cn\Mall.Common.resources.dll
+F:\工作\微途\外网代码\mall.oytour.com\Mall\Mall.Module.User\bin\Debug\netcoreapp3.0\zh-tw\Mall.Common.resources.dll
+F:\工作\微途\外网代码\mall.oytour.com\Mall\Mall.Module.User\obj\Debug\netcoreapp3.0\Mall.Module.User.csproj.CopyComplete
+>>>>>>> f4b05965cb6750d2336aa208af57bb79bfd46df7

Mall/Mall.Module.User/obj/Mall.Module.User.csproj.nuget.cache

 {
   "version": 1,
-  "dgSpecHash": "j6yxajyenbqPa/cjJ3Hu0GzpGuwZ5Whsl9IBPL2ovepwXhjXm9wuGPP2k67HRdPBxHptx5bPvzb/FNOrEfzIfA==",
+  "dgSpecHash": "wB70kQxh05yww5d1b8lDHQzIKgvG+AzqVEy3LYqw7Chb52EQr3MJz/2cCszj/TA4wAr+OzyDmrzi74IDDhluZg==",
   "success": true
 }
\ No newline at end of file

Mall/Mall.Repository/User/RB_TenantRepository.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using Mall.Model.Entity.User;
 using Mall.Model.Extend.User;
+using System.Linq;
 
 namespace Mall.Repository.User
 {
@@ -11,6 +12,29 @@ namespace Mall.Repository.User
     /// </summary>
     public class RB_TenantRepository : RepositoryBase<RB_Tenant>
     {
+        /// <summary>
+        /// 根据查询条件获取商户列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Tenant_Extend> GetListRepository(RB_Tenant_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            return Get<RB_Tenant_Extend>(builder.ToString()).ToList();
+        }
 
+        /// <summary>
+        /// 获取商户根也列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Tenant_Extend> GetPageListRepository(int pageIndex, int pageSize, out long rowCount, RB_Tenant_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            return GetPage<RB_Tenant_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+        }
     }
 }