Skip to content

M
mall.oytour.com
Commit a1933ba7 authored by 吴春's avatar 吴春
Browse files
Options

tij

parents 2f635a08 f4b05965
Hide whitespace changes
Inline Side-by-side
Showing with 12243 additions and 14 deletions
Mall/.vs/Mall/v16/.suo
View file @ a1933ba7
No preview for this file type
Mall/Mall.Module.User/Class1.cs deleted 100644 → 0
View file @ 2f635a08
using System;
namespace Mall.Module.User
{
public class Class1
{
}
}
Mall/Mall.Module.User/Mall.Module.User.csproj
View file @ a1933ba7
......@@ -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/bin/Debug/netcoreapp3.0/Mall.Module.User.deps.json
View file @ a1933ba7
This source diff could not be displayed because it is too large. You can view the blob instead.
Mall/Mall.Module.User/obj/Debug/netcoreapp3.0/Mall.Module.User.csproj.FileListAbsolute.txt
View file @ a1933ba7
......@@ -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
View file @ a1933ba7
{
"version": 1,
"dgSpecHash": "j6yxajyenbqPa/cjJ3Hu0GzpGuwZ5Whsl9IBPL2ovepwXhjXm9wuGPP2k67HRdPBxHptx5bPvzb/FNOrEfzIfA==",
"dgSpecHash": "wB70kQxh05yww5d1b8lDHQzIKgvG+AzqVEy3LYqw7Chb52EQr3MJz/2cCszj/TA4wAr+OzyDmrzi74IDDhluZg==",
"success": true
}
\ No newline at end of file
Mall/Mall.Module.User/obj/Mall.Module.User.csproj.nuget.dgspec.json
View file @ a1933ba7
......@@ -4,7 +4,321 @@
"D:\\project\\GitProject\\ShoppingMall\\Mall\\Mall.Module.User\\Mall.Module.User.csproj": {}
},
"projects": {
<<<<<<< HEAD
"D:\\project\\GitProject\\ShoppingMall\\Mall\\Mall.Module.User\\Mall.Module.User.csproj": {
=======
"F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.Common\\Mall.Common.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.Common\\Mall.Common.csproj",
"projectName": "Mall.Common",
"projectPath": "F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.Common\\Mall.Common.csproj",
"packagesPath": "C:\\Users\\qiaoyajun\\.nuget\\packages\\",
"outputPath": "F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.Common\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackagesFallback\\",
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
"C:\\Users\\qiaoyajun\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.Fallback.config"
],
"originalTargetFrameworks": [
"netcoreapp3.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"http://192.168.2.214:82/nuget": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"netcoreapp3.0": {
"projectReferences": {}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
}
},
"frameworks": {
"netcoreapp3.0": {
"dependencies": {
"Microsoft.AspNetCore.Http": {
"target": "Package",
"version": "[2.2.2, )"
},
"Microsoft.Extensions.Configuration": {
"target": "Package",
"version": "[3.0.1, )"
},
"Microsoft.Extensions.Configuration.Json": {
"target": "Package",
"version": "[3.0.1, )"
},
"NPOI": {
"target": "Package",
"version": "[2.4.1, )"
},
"Newtonsoft.Json": {
"target": "Package",
"version": "[12.0.3, )"
},
"StackExchange.Redis": {
"target": "Package",
"version": "[2.0.601, )"
},
"System.Configuration.ConfigurationManager": {
"target": "Package",
"version": "[4.6.0, )"
}
},
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48"
],
"assetTargetFallback": true,
"warn": true,
"frameworkReferences": {
"Microsoft.NETCore.App": {
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.100\\RuntimeIdentifierGraph.json"
}
}
},
"F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.DataAccess\\Mall.DataAccess.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.DataAccess\\Mall.DataAccess.csproj",
"projectName": "Mall.DataAccess",
"projectPath": "F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.DataAccess\\Mall.DataAccess.csproj",
"packagesPath": "C:\\Users\\qiaoyajun\\.nuget\\packages\\",
"outputPath": "F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.DataAccess\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackagesFallback\\",
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
"C:\\Users\\qiaoyajun\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.Fallback.config"
],
"originalTargetFrameworks": [
"netcoreapp3.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"http://192.168.2.214:82/nuget": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"netcoreapp3.0": {
"projectReferences": {}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
}
},
"frameworks": {
"netcoreapp3.0": {
"dependencies": {
"Microsoft.Extensions.Configuration": {
"target": "Package",
"version": "[3.0.1, )"
},
"Microsoft.Extensions.Configuration.Json": {
"target": "Package",
"version": "[3.0.1, )"
},
"MySql.Data": {
"target": "Package",
"version": "[8.0.19, )"
},
"System.Data.OleDb": {
"target": "Package",
"version": "[4.7.0, )"
},
"System.Data.SqlClient": {
"target": "Package",
"version": "[4.7.0, )"
}
},
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48"
],
"assetTargetFallback": true,
"warn": true,
"frameworkReferences": {
"Microsoft.NETCore.App": {
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.100\\RuntimeIdentifierGraph.json"
}
}
},
"F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.DataHelper\\Mall.DataHelper.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.DataHelper\\Mall.DataHelper.csproj",
"projectName": "Mall.DataHelper",
"projectPath": "F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.DataHelper\\Mall.DataHelper.csproj",
"packagesPath": "C:\\Users\\qiaoyajun\\.nuget\\packages\\",
"outputPath": "F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.DataHelper\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackagesFallback\\",
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
"C:\\Users\\qiaoyajun\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.Fallback.config"
],
"originalTargetFrameworks": [
"netcoreapp3.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"http://192.168.2.214:82/nuget": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"netcoreapp3.0": {
"projectReferences": {
"F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.Common\\Mall.Common.csproj": {
"projectPath": "F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.Common\\Mall.Common.csproj"
},
"F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.DataAccess\\Mall.DataAccess.csproj": {
"projectPath": "F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.DataAccess\\Mall.DataAccess.csproj"
},
"F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.Model\\Mall.Model.csproj": {
"projectPath": "F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.Model\\Mall.Model.csproj"
}
}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
}
},
"frameworks": {
"netcoreapp3.0": {
"dependencies": {
"Autofac": {
"target": "Package",
"version": "[4.9.4, )"
},
"Microsoft.AspNetCore.Http": {
"target": "Package",
"version": "[2.2.2, )"
}
},
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48"
],
"assetTargetFallback": true,
"warn": true,
"frameworkReferences": {
"Microsoft.NETCore.App": {
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.100\\RuntimeIdentifierGraph.json"
}
}
},
"F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.Model\\Mall.Model.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.Model\\Mall.Model.csproj",
"projectName": "Mall.Model",
"projectPath": "F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.Model\\Mall.Model.csproj",
"packagesPath": "C:\\Users\\qiaoyajun\\.nuget\\packages\\",
"outputPath": "F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.Model\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackagesFallback\\",
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
"C:\\Users\\qiaoyajun\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.Fallback.config"
],
"originalTargetFrameworks": [
"netcoreapp3.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"http://192.168.2.214:82/nuget": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"netcoreapp3.0": {
"projectReferences": {}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
}
},
"frameworks": {
"netcoreapp3.0": {
"dependencies": {
"MongoDB.Bson": {
"target": "Package",
"version": "[2.10.3, )"
}
},
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48"
],
"assetTargetFallback": true,
"warn": true,
"frameworkReferences": {
"Microsoft.NETCore.App": {
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.100\\RuntimeIdentifierGraph.json"
}
}
},
"F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.Module.User\\Mall.Module.User.csproj": {
>>>>>>> f4b05965cb6750d2336aa208af57bb79bfd46df7
"version": "1.0.0",
"restore": {
"projectUniqueName": "D:\\project\\GitProject\\ShoppingMall\\Mall\\Mall.Module.User\\Mall.Module.User.csproj",
......@@ -32,7 +346,14 @@
},
"frameworks": {
"netcoreapp3.0": {
"projectReferences": {}
"projectReferences": {
"F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.Model\\Mall.Model.csproj": {
"projectPath": "F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.Model\\Mall.Model.csproj"
},
"F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.Repository\\Mall.Repository.csproj": {
"projectPath": "F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.Repository\\Mall.Repository.csproj"
}
}
}
},
"warningProperties": {
......@@ -43,6 +364,91 @@
},
"frameworks": {
"netcoreapp3.0": {
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48"
],
"assetTargetFallback": true,
"warn": true,
"frameworkReferences": {
"Microsoft.NETCore.App": {
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.100\\RuntimeIdentifierGraph.json"
}
}
},
"F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.Repository\\Mall.Repository.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.Repository\\Mall.Repository.csproj",
"projectName": "Mall.Repository",
"projectPath": "F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.Repository\\Mall.Repository.csproj",
"packagesPath": "C:\\Users\\qiaoyajun\\.nuget\\packages\\",
"outputPath": "F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.Repository\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackagesFallback\\",
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
"C:\\Users\\qiaoyajun\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.Fallback.config"
],
"originalTargetFrameworks": [
"netcoreapp3.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"http://192.168.2.214:82/nuget": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"netcoreapp3.0": {
"projectReferences": {
"F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.Common\\Mall.Common.csproj": {
"projectPath": "F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.Common\\Mall.Common.csproj"
},
"F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.DataAccess\\Mall.DataAccess.csproj": {
"projectPath": "F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.DataAccess\\Mall.DataAccess.csproj"
},
"F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.DataHelper\\Mall.DataHelper.csproj": {
"projectPath": "F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.DataHelper\\Mall.DataHelper.csproj"
},
"F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.Model\\Mall.Model.csproj": {
"projectPath": "F:\\工作\\微途\\外网代码\\mall.oytour.com\\Mall\\Mall.Model\\Mall.Model.csproj"
}
}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
}
},
"frameworks": {
"netcoreapp3.0": {
"dependencies": {
"Microsoft.AspNetCore": {
"target": "Package",
"version": "[2.2.0, )"
},
"Microsoft.Extensions.Configuration": {
"target": "Package",
"version": "[3.0.1, )"
},
"MySql.Data": {
"target": "Package",
"version": "[8.0.19, )"
}
},
"imports": [
"net461",
"net462",
......
Mall/Mall.Module.User/obj/project.assets.json
View file @ a1933ba7
This source diff could not be displayed because it is too large. You can view the blob instead.
Mall/Mall.Repository/User/RB_TenantRepository.cs
View file @ a1933ba7
......@@ -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();
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment