From cc09b6fe6ffac34a4eeeb26d313b187713cae0de Mon Sep 17 00:00:00 2001 From: heyuntao <heyuntao@LAPTOP-MP4HD5NS> Date: 星期五, 05 五月 2023 09:43:29 +0800 Subject: [PATCH] no message --- Operater.DTO/Tk/TxUserinfoDto.cs | 50 -- .vs/ProjectEvaluation/fxproject.projects.v6.1 | 0 Operater.DTO/obj/Debug/netcoreapp3.1/Operater.DTO.csproj.CoreCompileInputs.cache | 2 Api.Operater/bin/Debug/netcoreapp3.1/Operater.Service.pdb | 0 Operater.Common/bin/Debug/netcoreapp3.1/Operater.Common.pdb | 0 Operater.DTO/obj/Debug/netcoreapp3.1/Operater.DTO.dll | 0 Opreater.Service/obj/Debug/netcoreapp3.1/Operater.Service.pdb | 0 Api.Operater/bin/Debug/netcoreapp3.1/Api.Operater.xml | 14 Api.Operater/bin/Debug/netcoreapp3.1/Operater.DTO.xml | 110 ++-- Opreater.Service/obj/Debug/netcoreapp3.1/Operater.Service.dll | 0 Operater.Common/bin/Debug/netcoreapp3.1/Operater.DTO.dll | 0 Api.Operater/bin/Debug/netcoreapp3.1/Operater.DTO.pdb | 0 Opreater.Service/bin/Debug/netcoreapp3.1/Operater.DTO.pdb | 0 Api.Operater/bin/Debug/netcoreapp3.1/Operater.DTO.dll | 0 Operater.DTO/obj/Debug/netcoreapp3.1/Operater.DTO.pdb | 0 Operater.DTO/Operater.DTO.XML | 110 ++-- Api.Operater/bin/Debug/netcoreapp3.1/Operater.Common.dll | 0 Api.Operater/bin/Debug/netcoreapp3.1/Operater.Service.dll | 0 Api.Operater/obj/Debug/netcoreapp3.1/Api.Operater.pdb | 0 Api.Operater/Controllers/TkTradeController.cs | 48 ++ Operater.DTO/Tk/TkWxUtilDto.cs | 5 Operater.DTO/Tk/TkTradeDto.cs | 59 ++ Api.Operater/Api.Operater.xml | 14 Opreater.Service/bin/Debug/netcoreapp3.1/Operater.DTO.dll | 0 Api.Operater/bin/Debug/netcoreapp3.1/Operater.Common.pdb | 0 Api.Operater/obj/Debug/netcoreapp3.1/Api.Operater.dll | 0 Operater.DTO/bin/Debug/netcoreapp3.1/Operater.DTO.pdb | 0 .gitignore | 316 +++++++++++++++ Api.Operater/obj/Debug/netcoreapp3.1/Api.Operater.csproj.AssemblyReference.cache | 0 Api.Operater/Controllers/TkUserinfoController.cs | 157 +++++-- Operater.DTO/bin/Debug/netcoreapp3.1/Operater.DTO.XML | 110 ++-- Operater.Common/bin/Debug/netcoreapp3.1/Operater.DTO.xml | 110 ++-- Opreater.Service/bin/Debug/netcoreapp3.1/Operater.DTO.xml | 110 ++-- Operater.Common/obj/Debug/netcoreapp3.1/Operater.Common.csproj.AssemblyReference.cache | 0 Operater.DbModel/BillRecord.cs | 6 Operater.DTO/bin/Debug/netcoreapp3.1/Operater.DTO.dll | 0 .vs/TkProject/v17/.suo | 0 Api.Operater/obj/Debug/netcoreapp3.1/Api.Operater.csproj.CoreCompileInputs.cache | 2 .vs/ProjectEvaluation/fxproject.metadata.v6.1 | 0 Operater.Common/bin/Debug/netcoreapp3.1/Operater.DTO.pdb | 0 Operater.Common/obj/Debug/netcoreapp3.1/Operater.Common.pdb | 0 Api.Operater/bin/Debug/netcoreapp3.1/Api.Operater.dll | 0 Opreater.Service/bin/Debug/netcoreapp3.1/Operater.Service.dll | 0 Opreater.Service/bin/Debug/netcoreapp3.1/Operater.Service.pdb | 0 Api.Operater/bin/Debug/netcoreapp3.1/Api.Operater.pdb | 0 /dev/null | 0 Operater.Common/bin/Debug/netcoreapp3.1/Operater.Common.dll | 0 .vs/FxProject/DesignTimeBuild/.dtbcache.v2 | 0 Opreater.Service/obj/Debug/netcoreapp3.1/Operater.Service.csproj.AssemblyReference.cache | 0 Operater.Common/obj/Debug/netcoreapp3.1/Operater.Common.dll | 0 50 files changed, 861 insertions(+), 362 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b306f1c --- /dev/null +++ b/.gitignore @@ -0,0 +1,316 @@ +.vs/ +obj/ +bin/ +packages/ +logs +*.log +*.xlsx +*.xls +*.csv +*.xml +*.vspscc +*.user +.idea/ +.config/ +PublishProfiles/ +*.user +UpgradeLog.htm +Backup/ +*.nupkg + +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.suo +*.user +*.userosscache +*.sln.docstates +*.sqlite +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs +*.log +*.nuspec +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +/docs/_api + +# Visual Studio 2015 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +wwwroot/ +ClientApp/dist/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# TODO: Comment the next line if you want to checkin your web deploy settings +# but database connection strings (with potential passwords) will be unencrypted +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/packages/* +# except build/, which is used as an MSBuild target. +!**/packages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/packages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Typescript v1 declaration files +typings/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush +.cr/ + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs +*.xml + +*.orig +.vscode/ +ConsoleApp1/ +*.DotSettings diff --git a/.vs/FxProject/DesignTimeBuild/.dtbcache.v2 b/.vs/FxProject/DesignTimeBuild/.dtbcache.v2 index ced314b..fe48edc 100644 --- a/.vs/FxProject/DesignTimeBuild/.dtbcache.v2 +++ b/.vs/FxProject/DesignTimeBuild/.dtbcache.v2 Binary files differ diff --git a/.vs/FxProject/FileContentIndex/77b1bd10-3847-4daf-aec9-07a800fa2c76.vsidx b/.vs/FxProject/FileContentIndex/77b1bd10-3847-4daf-aec9-07a800fa2c76.vsidx deleted file mode 100644 index 84ae511..0000000 --- a/.vs/FxProject/FileContentIndex/77b1bd10-3847-4daf-aec9-07a800fa2c76.vsidx +++ /dev/null Binary files differ diff --git a/.vs/FxProject/FileContentIndex/c55a831d-fb02-44bd-bf28-e2e1f693aa76.vsidx b/.vs/FxProject/FileContentIndex/c55a831d-fb02-44bd-bf28-e2e1f693aa76.vsidx deleted file mode 100644 index ab0ae4b..0000000 --- a/.vs/FxProject/FileContentIndex/c55a831d-fb02-44bd-bf28-e2e1f693aa76.vsidx +++ /dev/null Binary files differ diff --git a/.vs/ProjectEvaluation/fxproject.metadata.v6.1 b/.vs/ProjectEvaluation/fxproject.metadata.v6.1 index 1f37a9c..75fcf5c 100644 --- a/.vs/ProjectEvaluation/fxproject.metadata.v6.1 +++ b/.vs/ProjectEvaluation/fxproject.metadata.v6.1 Binary files differ diff --git a/.vs/ProjectEvaluation/fxproject.projects.v6.1 b/.vs/ProjectEvaluation/fxproject.projects.v6.1 index 149a0d4..8e309fd 100644 --- a/.vs/ProjectEvaluation/fxproject.projects.v6.1 +++ b/.vs/ProjectEvaluation/fxproject.projects.v6.1 Binary files differ diff --git a/.vs/TkProject/v17/.suo b/.vs/TkProject/v17/.suo index cdc6d26..d8857f9 100644 --- a/.vs/TkProject/v17/.suo +++ b/.vs/TkProject/v17/.suo Binary files differ diff --git a/Api.Operater/Api.Operater.xml b/Api.Operater/Api.Operater.xml index 47c26f8..676f9cb 100644 --- a/Api.Operater/Api.Operater.xml +++ b/Api.Operater/Api.Operater.xml @@ -222,6 +222,13 @@ <param name="request"></param> <returns></returns> </member> + <member name="M:Api.Operater.Controllers.TkTradeController.GetTkTradeList(Operater.DTO.Tk.GetTkTradeListRequest)"> + <summary> + 鏌ヨ鎴戠殑璁㈠崟鏄庣粏鎺ュ彛 + </summary> + <param name="request"></param> + <returns></returns> + </member> <member name="M:Api.Operater.Controllers.TkUserinfoController.GetWxOpenid(Operater.DTO.Tk.GetOpenidRequest)"> <summary> 鑾峰彇寰俊openid @@ -265,13 +272,6 @@ <member name="M:Api.Operater.Controllers.TkUserinfoController.GetBillList(Operater.DTO.Tk.GetTkBillRecordRequest)"> <summary> 鍒嗛〉鑾峰彇璐﹀崟鏄庣粏骞惰繑鍥炴敮鍑恒�佹敹鍏ユ�婚噾棰� - </summary> - <param name="request"></param> - <returns></returns> - </member> - <member name="M:Api.Operater.Controllers.TkUserinfoController.GetTkTradeList(Operater.DTO.Tk.GetTkTradeListRequest)"> - <summary> - 鏌ヨ鎴戠殑璁㈠崟鏄庣粏鎺ュ彛 </summary> <param name="request"></param> <returns></returns> diff --git a/Api.Operater/Controllers/TkTradeController.cs b/Api.Operater/Controllers/TkTradeController.cs new file mode 100644 index 0000000..9f573f8 --- /dev/null +++ b/Api.Operater/Controllers/TkTradeController.cs @@ -0,0 +1,48 @@ +锘縰sing CommonUtil.Db; +using CommonUtil.Top; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Operater.DAL; +using Operater.DbModel; +using Operater.DTO.Tk; +using SqlSugar; +using System; +using CommonUtil; + +namespace Api.Operater.Controllers +{ + + [Route(TopConstants.API_ROUTE)] + public class TkTradeController : BaseController + { + /// <summary> + /// 鏌ヨ鎴戠殑璁㈠崟鏄庣粏鎺ュ彛 + /// </summary> + /// <param name="request"></param> + /// <returns></returns> + [HttpPost] + [ProducesDefaultResponseType(typeof(GetTkTradeListResponse))] + public IActionResult GetTkTradeList([FromBody] GetTkTradeListRequest request) + { + //鍒嗛〉鎸夋椂闂存煡璇㈣处鍗曟槑缁� + var whereexpress = Expressionable.Create<TkTrade>() + .And(t => t.Memberid == request.Id.ToString()) + .AndIF(!request.stime.IsNull() && request.stime > DateTime.Parse("1900-01-01 00:00:00"), t => t.Created >= request.stime) + .AndIF(!request.etime.IsNull() && request.etime > DateTime.Parse("1900-01-01 00:00:00"), t => t.Created <= request.etime) + .AndIF(!request.tid.IsNullOrEmpty(), t => t.Tid == request.tid) + .AndIF(!request.trade_status.IsNullOrEmpty(), t => t.Status == request.trade_status) + .ToExpression(); + int totalcount = 0; + var orderlist = new TkTradeDAL().ListPageGet(whereexpress, t => t.Created, DbEnum.OrderType.Desc, request.PageNo, request.PageSize, ref totalcount); + GetTkTradeListResponse getTkOrderRecord = new GetTkTradeListResponse(); + if (orderlist.Count > 0) + { + getTkOrderRecord.TkTrades = orderlist; + getTkOrderRecord.PageNo = request.PageNo; + getTkOrderRecord.PageSize = request.PageSize; + getTkOrderRecord.TotalCount = totalcount; + } + return Success(getTkOrderRecord); + } + } +} diff --git a/Api.Operater/Controllers/TkUserinfoController.cs b/Api.Operater/Controllers/TkUserinfoController.cs index 9d2dbf9..f77836a 100644 --- a/Api.Operater/Controllers/TkUserinfoController.cs +++ b/Api.Operater/Controllers/TkUserinfoController.cs @@ -30,6 +30,7 @@ using CommonUtil.Security; using CommonUtil.Top; using CommonUtil.Db; +using System.Text; namespace Api.Operater.Controllers { @@ -336,35 +337,6 @@ } /// <summary> - /// 鏌ヨ鎴戠殑璁㈠崟鏄庣粏鎺ュ彛 - /// </summary> - /// <param name="request"></param> - /// <returns></returns> - [HttpPost] - [ProducesDefaultResponseType(typeof(GetTkTradeListResponse))] - public IActionResult GetTkTradeList([FromBody] GetTkTradeListRequest request) - { - //鍒嗛〉鎸夋椂闂存煡璇㈣处鍗曟槑缁� - var whereexpress = Expressionable.Create<TkTrade>() - .And(t => t.Memberid == request.Id.ToString()) - .AndIF(!request.stime.IsNull() && request.stime > DateTime.Parse("1900-01-01 00:00:00"), t => t.Created >= request.stime) - .AndIF(!request.etime.IsNull() && request.etime > DateTime.Parse("1900-01-01 00:00:00"), t => t.Created <= request.etime) - .AndIF(!request.tid.IsNullOrEmpty(), t => t.Tid == request.tid) - .ToExpression(); - int totalcount = 0; - var orderlist = new TkTradeDAL().ListPageGet(whereexpress, t => t.Created, DbEnum.OrderType.Desc, request.PageNo, request.PageSize, ref totalcount); - GetTkTradeListResponse getTkOrderRecord = new GetTkTradeListResponse(); - if (orderlist.Count > 0) - { - getTkOrderRecord.TkTrades = orderlist; - getTkOrderRecord.PageNo = request.PageNo; - getTkOrderRecord.PageSize = request.PageSize; - getTkOrderRecord.TotalCount = totalcount; - } - return Success(getTkOrderRecord); - } - - /// <summary> /// 鐢熸垚娴锋姤浜岀淮鐮� /// </summary> /// <param name="request"></param> @@ -372,35 +344,57 @@ [HttpPost] public IActionResult CreateQrCode([FromBody] CreateQrCodeRequest request) { - int x = 231; int y = 474; int width = 305; int height=336; - string posterPath = Path.Combine("", @"D:\poster.png"); // 鏇挎崲涓轰綘鐨勫疄闄呮捣鎶ョ殑缁濆璺緞 - // 鐢熸垚浜岀淮鐮� - QRCodeGenerator qrGenerator = new QRCodeGenerator(); - QRCodeData qrCodeData = qrGenerator.CreateQrCode(request.url, QRCodeGenerator.ECCLevel.Q); - QRCode qrCode = new QRCode(qrCodeData); - Bitmap qrCodeImage = qrCode.GetGraphic(20); // 璋冩暣 20 浠ユ帶鍒朵簩缁寸爜鐨勫ぇ灏� - - // 鍦ㄦ捣鎶ヤ腑缁樺埗浜岀淮鐮� - using (var posterImage = new Bitmap(posterPath)) - using (var graphics = Graphics.FromImage(posterImage)) + //鑾峰彇access_token + string access_token = string.Empty; + MySqlHelper dbmain = new MySqlHelper(); + DataTable dt = dbmain.ExecuteDataTable("select fx_wx_token from appset"); + if (dt != null && dt.Rows.Count > 0) { - // 灏嗕簩缁寸爜缁樺埗鍦ㄦ寚瀹氬尯鍩� - RectangleF qrCodeArea = new RectangleF(x, y, width, height); - graphics.DrawImage(qrCodeImage, qrCodeArea); + access_token = dt.Rows[0]["fx_wx_token"].ToString(); + string url = $"https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token={access_token}"; + WebUtil util = new WebUtil(); + Dictionary<string, string> dic = new Dictionary<string, string>(); + dic.Add("scene", $"invite_code={request.invite_code}"); + // var result = Newtonsoft.Json.JsonConvert.DeserializeObject<GetwxacodeunlimitResponse>(PostJson(url, dic)); + var result = Post4Download(url, dic); - // 灏嗙粯鍒跺悗鐨勬捣鎶ヤ繚瀛樹负鍐呭瓨娴� - using (var memoryStream = new MemoryStream()) + + //if (result.errcode != "0") + //{ + // return Error(result.errmsg); + //} + byte[] imagebytes =result.Item3; + Bitmap qrCodeImage = new Bitmap(new MemoryStream(imagebytes)); + int x = 430; int y = 1513; int width = 361; int height = 365; + string posterPath = Path.Combine("", @"D:\poster.png"); // 鏇挎崲涓轰綘鐨勫疄闄呮捣鎶ョ殑缁濆璺緞 + // 鍦ㄦ捣鎶ヤ腑缁樺埗浜岀淮鐮� + using (var posterImage = new Bitmap(posterPath)) + using (var graphics = Graphics.FromImage(posterImage)) { - posterImage.Save(memoryStream, System.Drawing.Imaging.ImageFormat.Png); + // 灏嗕簩缁寸爜缁樺埗鍦ㄦ寚瀹氬尯鍩� + RectangleF qrCodeArea = new RectangleF(x, y, width, height); + graphics.DrawImage(qrCodeImage, qrCodeArea); - // 灏嗗唴瀛樻祦杞崲涓哄瓧鑺傛暟缁� - byte[] imageBytes = memoryStream.ToArray(); + // 灏嗙粯鍒跺悗鐨勬捣鎶ヤ繚瀛樹负鍐呭瓨娴� + using (var memoryStream = new MemoryStream()) + { + posterImage.Save(memoryStream, System.Drawing.Imaging.ImageFormat.Png); - // 杩斿洖鍥惧儚缁欏墠绔� - return File(imageBytes, "image/png"); + // 灏嗗唴瀛樻祦杞崲涓哄瓧鑺傛暟缁� + byte[] imageBytes = memoryStream.ToArray(); + + // 杩斿洖鍥惧儚缁欏墠绔� + return File(imageBytes, "image/png"); + } } + } + else + { + return Error("鑾峰彇access_token澶辫触"); + } + } /// <summary> @@ -428,5 +422,68 @@ return result; } } + + public static Tuple<bool, string, byte[]> Post4Download(string postUrl, object dataObj) + { + try + { + var json = JsonConvert.SerializeObject(dataObj, new JsonSerializerSettings { DefaultValueHandling = DefaultValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore }); + var byteArray = Encoding.UTF8.GetBytes(json); + + var request = (HttpWebRequest)WebRequest.Create(postUrl); + request.Method = "POST"; + request.KeepAlive = false; + request.ProtocolVersion = HttpVersion.Version11; + request.Timeout = -1; + request.ReadWriteTimeout = -1; + request.ContentType = "application/json;charset=utf-8"; + request.ContentLength = byteArray.Length; + request.ServicePoint.Expect100Continue = false; + + using (var stream = request.GetRequestStream()) + { + stream.Write(byteArray, 0, byteArray.Length); + stream.Flush(); + } + + //鎺ユ敹杩斿洖淇℃伅 + var message = ""; + byte[] buf = null; + using (var response = (HttpWebResponse)request.GetResponse()) + { + if (response.StatusCode == HttpStatusCode.OK) + { + buf = new byte[response.ContentLength]; + var responseStream = response.GetResponseStream(); + if (responseStream != null) + { + var offset = 0; + do + { + var count = responseStream.Read(buf, offset, buf.Length - offset); + offset += count; + } while (offset < buf.Length); + } + else + { + message = "fail, responseStream is null."; + } + } + else + { + message = $"fail, response.StatusCode is {response.StatusCode}."; + } + } + + request.Abort(); + + return new Tuple<bool, string, byte[]>(!message.StartsWith("fail, "), message, buf); + } + catch (Exception ex) + { + return new Tuple<bool, string, byte[]>(false, $"fail, {ex.Message}", null); + } + } + } } diff --git a/Api.Operater/bin/Debug/netcoreapp3.1/Api.Operater.dll b/Api.Operater/bin/Debug/netcoreapp3.1/Api.Operater.dll index 4d8c962..4a0e8a6 100644 --- a/Api.Operater/bin/Debug/netcoreapp3.1/Api.Operater.dll +++ b/Api.Operater/bin/Debug/netcoreapp3.1/Api.Operater.dll Binary files differ diff --git a/Api.Operater/bin/Debug/netcoreapp3.1/Api.Operater.pdb b/Api.Operater/bin/Debug/netcoreapp3.1/Api.Operater.pdb index d4dfae8..7c1f781 100644 --- a/Api.Operater/bin/Debug/netcoreapp3.1/Api.Operater.pdb +++ b/Api.Operater/bin/Debug/netcoreapp3.1/Api.Operater.pdb Binary files differ diff --git a/Api.Operater/bin/Debug/netcoreapp3.1/Api.Operater.xml b/Api.Operater/bin/Debug/netcoreapp3.1/Api.Operater.xml index 47c26f8..676f9cb 100644 --- a/Api.Operater/bin/Debug/netcoreapp3.1/Api.Operater.xml +++ b/Api.Operater/bin/Debug/netcoreapp3.1/Api.Operater.xml @@ -222,6 +222,13 @@ <param name="request"></param> <returns></returns> </member> + <member name="M:Api.Operater.Controllers.TkTradeController.GetTkTradeList(Operater.DTO.Tk.GetTkTradeListRequest)"> + <summary> + 鏌ヨ鎴戠殑璁㈠崟鏄庣粏鎺ュ彛 + </summary> + <param name="request"></param> + <returns></returns> + </member> <member name="M:Api.Operater.Controllers.TkUserinfoController.GetWxOpenid(Operater.DTO.Tk.GetOpenidRequest)"> <summary> 鑾峰彇寰俊openid @@ -265,13 +272,6 @@ <member name="M:Api.Operater.Controllers.TkUserinfoController.GetBillList(Operater.DTO.Tk.GetTkBillRecordRequest)"> <summary> 鍒嗛〉鑾峰彇璐﹀崟鏄庣粏骞惰繑鍥炴敮鍑恒�佹敹鍏ユ�婚噾棰� - </summary> - <param name="request"></param> - <returns></returns> - </member> - <member name="M:Api.Operater.Controllers.TkUserinfoController.GetTkTradeList(Operater.DTO.Tk.GetTkTradeListRequest)"> - <summary> - 鏌ヨ鎴戠殑璁㈠崟鏄庣粏鎺ュ彛 </summary> <param name="request"></param> <returns></returns> diff --git a/Api.Operater/bin/Debug/netcoreapp3.1/Operater.Common.dll b/Api.Operater/bin/Debug/netcoreapp3.1/Operater.Common.dll index 5062588..6ec18e9 100644 --- a/Api.Operater/bin/Debug/netcoreapp3.1/Operater.Common.dll +++ b/Api.Operater/bin/Debug/netcoreapp3.1/Operater.Common.dll Binary files differ diff --git a/Api.Operater/bin/Debug/netcoreapp3.1/Operater.Common.pdb b/Api.Operater/bin/Debug/netcoreapp3.1/Operater.Common.pdb index d2dfda9..6420987 100644 --- a/Api.Operater/bin/Debug/netcoreapp3.1/Operater.Common.pdb +++ b/Api.Operater/bin/Debug/netcoreapp3.1/Operater.Common.pdb Binary files differ diff --git a/Api.Operater/bin/Debug/netcoreapp3.1/Operater.DTO.dll b/Api.Operater/bin/Debug/netcoreapp3.1/Operater.DTO.dll index d0d11b3..3d999ea 100644 --- a/Api.Operater/bin/Debug/netcoreapp3.1/Operater.DTO.dll +++ b/Api.Operater/bin/Debug/netcoreapp3.1/Operater.DTO.dll Binary files differ diff --git a/Api.Operater/bin/Debug/netcoreapp3.1/Operater.DTO.pdb b/Api.Operater/bin/Debug/netcoreapp3.1/Operater.DTO.pdb index 12d93f0..1ae52ba 100644 --- a/Api.Operater/bin/Debug/netcoreapp3.1/Operater.DTO.pdb +++ b/Api.Operater/bin/Debug/netcoreapp3.1/Operater.DTO.pdb Binary files differ diff --git a/Api.Operater/bin/Debug/netcoreapp3.1/Operater.DTO.xml b/Api.Operater/bin/Debug/netcoreapp3.1/Operater.DTO.xml index 13f613c..47b9fc4 100644 --- a/Api.Operater/bin/Debug/netcoreapp3.1/Operater.DTO.xml +++ b/Api.Operater/bin/Debug/netcoreapp3.1/Operater.DTO.xml @@ -634,6 +634,61 @@ 鍟嗗搧杩炴帴鍦板潃 </summary> </member> + <member name="T:Operater.DTO.Tk.GetTkTradeListRequest"> + <summary> + 鑾峰彇璁㈠崟鏄庣粏璇锋眰鍙傛暟 + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.Id"> + <summary> + 浼氬憳Id + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.tid"> + <summary> + 璁㈠崟鍙� + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.stime"> + <summary> + 寮�濮嬫椂闂� + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.etime"> + <summary> + 缁撴潫鏃堕棿 + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.trade_status"> + <summary> + 1:宸蹭粯娆撅紝2锛氬凡瀹屾垚锛�3锛氬凡澶辨晥锛�4锛氬凡缁撶畻 + </summary> + </member> + <member name="T:Operater.DTO.Tk.GetTkTradeListResponse"> + <summary> + 鑾峰彇璁㈠崟鏄庣粏杩斿洖鍙傛暟 + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.PageNo"> + <summary> + 褰撳墠椤� + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.PageSize"> + <summary> + 鏉℃暟 + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.TotalCount"> + <summary> + 鎬绘暟 + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.TkTrades"> + <summary> + 璁㈠崟鏄庣粏 + </summary> + </member> <member name="T:Operater.DTO.Tk.GetOpenidRequest"> <summary> 鑾峰彇Openid璇锋眰鍙傛暟 @@ -764,6 +819,11 @@ 鍒涘缓娴锋姤浜岀淮鐮佽姹傚弬鏁� </summary> </member> + <member name="P:Operater.DTO.Tk.CreateQrCodeRequest.invite_code"> + <summary> + 閭�璇风爜 + </summary> + </member> <member name="T:Operater.DTO.Tk.GetTeamUserInfoRequest"> <summary> 鑾峰彇鍥㈤槦鎴愬憳璇锋眰鍙傛暟 @@ -832,56 +892,6 @@ <member name="P:Operater.DTO.Tk.GetTkBillRecordResponse.billRecords"> <summary> 璐﹀崟鏄庣粏 - </summary> - </member> - <member name="T:Operater.DTO.Tk.GetTkTradeListRequest"> - <summary> - 鑾峰彇璁㈠崟鏄庣粏璇锋眰鍙傛暟 - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.Id"> - <summary> - 浼氬憳Id - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.tid"> - <summary> - 璁㈠崟鍙� - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.stime"> - <summary> - 寮�濮嬫椂闂� - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.etime"> - <summary> - 缁撴潫鏃堕棿 - </summary> - </member> - <member name="T:Operater.DTO.Tk.GetTkTradeListResponse"> - <summary> - 鑾峰彇璁㈠崟鏄庣粏杩斿洖鍙傛暟 - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.PageNo"> - <summary> - 褰撳墠椤� - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.PageSize"> - <summary> - 鏉℃暟 - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.TotalCount"> - <summary> - 鎬绘暟 - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.TkTrades"> - <summary> - 璁㈠崟鏄庣粏 </summary> </member> </members> diff --git a/Api.Operater/bin/Debug/netcoreapp3.1/Operater.Service.dll b/Api.Operater/bin/Debug/netcoreapp3.1/Operater.Service.dll index 33b945c..37e0956 100644 --- a/Api.Operater/bin/Debug/netcoreapp3.1/Operater.Service.dll +++ b/Api.Operater/bin/Debug/netcoreapp3.1/Operater.Service.dll Binary files differ diff --git a/Api.Operater/bin/Debug/netcoreapp3.1/Operater.Service.pdb b/Api.Operater/bin/Debug/netcoreapp3.1/Operater.Service.pdb index c1c24e6..307db5a 100644 --- a/Api.Operater/bin/Debug/netcoreapp3.1/Operater.Service.pdb +++ b/Api.Operater/bin/Debug/netcoreapp3.1/Operater.Service.pdb Binary files differ diff --git a/Api.Operater/obj/Debug/netcoreapp3.1/Api.Operater.csproj.AssemblyReference.cache b/Api.Operater/obj/Debug/netcoreapp3.1/Api.Operater.csproj.AssemblyReference.cache index ec7e543..3cabbd9 100644 --- a/Api.Operater/obj/Debug/netcoreapp3.1/Api.Operater.csproj.AssemblyReference.cache +++ b/Api.Operater/obj/Debug/netcoreapp3.1/Api.Operater.csproj.AssemblyReference.cache Binary files differ diff --git a/Api.Operater/obj/Debug/netcoreapp3.1/Api.Operater.csproj.CoreCompileInputs.cache b/Api.Operater/obj/Debug/netcoreapp3.1/Api.Operater.csproj.CoreCompileInputs.cache index c298341..01cbd4a 100644 --- a/Api.Operater/obj/Debug/netcoreapp3.1/Api.Operater.csproj.CoreCompileInputs.cache +++ b/Api.Operater/obj/Debug/netcoreapp3.1/Api.Operater.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -54aef69b3d31332ef23b89322786bdca49f6e83c +e55800a62cab93fe26c9ce9415881095f5e807b3 diff --git a/Api.Operater/obj/Debug/netcoreapp3.1/Api.Operater.dll b/Api.Operater/obj/Debug/netcoreapp3.1/Api.Operater.dll index 4d8c962..4a0e8a6 100644 --- a/Api.Operater/obj/Debug/netcoreapp3.1/Api.Operater.dll +++ b/Api.Operater/obj/Debug/netcoreapp3.1/Api.Operater.dll Binary files differ diff --git a/Api.Operater/obj/Debug/netcoreapp3.1/Api.Operater.pdb b/Api.Operater/obj/Debug/netcoreapp3.1/Api.Operater.pdb index d4dfae8..7c1f781 100644 --- a/Api.Operater/obj/Debug/netcoreapp3.1/Api.Operater.pdb +++ b/Api.Operater/obj/Debug/netcoreapp3.1/Api.Operater.pdb Binary files differ diff --git a/Operater.Common/bin/Debug/netcoreapp3.1/Operater.Common.dll b/Operater.Common/bin/Debug/netcoreapp3.1/Operater.Common.dll index 5062588..6ec18e9 100644 --- a/Operater.Common/bin/Debug/netcoreapp3.1/Operater.Common.dll +++ b/Operater.Common/bin/Debug/netcoreapp3.1/Operater.Common.dll Binary files differ diff --git a/Operater.Common/bin/Debug/netcoreapp3.1/Operater.Common.pdb b/Operater.Common/bin/Debug/netcoreapp3.1/Operater.Common.pdb index d2dfda9..6420987 100644 --- a/Operater.Common/bin/Debug/netcoreapp3.1/Operater.Common.pdb +++ b/Operater.Common/bin/Debug/netcoreapp3.1/Operater.Common.pdb Binary files differ diff --git a/Operater.Common/bin/Debug/netcoreapp3.1/Operater.DTO.dll b/Operater.Common/bin/Debug/netcoreapp3.1/Operater.DTO.dll index d0d11b3..3d999ea 100644 --- a/Operater.Common/bin/Debug/netcoreapp3.1/Operater.DTO.dll +++ b/Operater.Common/bin/Debug/netcoreapp3.1/Operater.DTO.dll Binary files differ diff --git a/Operater.Common/bin/Debug/netcoreapp3.1/Operater.DTO.pdb b/Operater.Common/bin/Debug/netcoreapp3.1/Operater.DTO.pdb index 12d93f0..1ae52ba 100644 --- a/Operater.Common/bin/Debug/netcoreapp3.1/Operater.DTO.pdb +++ b/Operater.Common/bin/Debug/netcoreapp3.1/Operater.DTO.pdb Binary files differ diff --git a/Operater.Common/bin/Debug/netcoreapp3.1/Operater.DTO.xml b/Operater.Common/bin/Debug/netcoreapp3.1/Operater.DTO.xml index 13f613c..47b9fc4 100644 --- a/Operater.Common/bin/Debug/netcoreapp3.1/Operater.DTO.xml +++ b/Operater.Common/bin/Debug/netcoreapp3.1/Operater.DTO.xml @@ -634,6 +634,61 @@ 鍟嗗搧杩炴帴鍦板潃 </summary> </member> + <member name="T:Operater.DTO.Tk.GetTkTradeListRequest"> + <summary> + 鑾峰彇璁㈠崟鏄庣粏璇锋眰鍙傛暟 + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.Id"> + <summary> + 浼氬憳Id + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.tid"> + <summary> + 璁㈠崟鍙� + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.stime"> + <summary> + 寮�濮嬫椂闂� + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.etime"> + <summary> + 缁撴潫鏃堕棿 + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.trade_status"> + <summary> + 1:宸蹭粯娆撅紝2锛氬凡瀹屾垚锛�3锛氬凡澶辨晥锛�4锛氬凡缁撶畻 + </summary> + </member> + <member name="T:Operater.DTO.Tk.GetTkTradeListResponse"> + <summary> + 鑾峰彇璁㈠崟鏄庣粏杩斿洖鍙傛暟 + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.PageNo"> + <summary> + 褰撳墠椤� + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.PageSize"> + <summary> + 鏉℃暟 + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.TotalCount"> + <summary> + 鎬绘暟 + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.TkTrades"> + <summary> + 璁㈠崟鏄庣粏 + </summary> + </member> <member name="T:Operater.DTO.Tk.GetOpenidRequest"> <summary> 鑾峰彇Openid璇锋眰鍙傛暟 @@ -764,6 +819,11 @@ 鍒涘缓娴锋姤浜岀淮鐮佽姹傚弬鏁� </summary> </member> + <member name="P:Operater.DTO.Tk.CreateQrCodeRequest.invite_code"> + <summary> + 閭�璇风爜 + </summary> + </member> <member name="T:Operater.DTO.Tk.GetTeamUserInfoRequest"> <summary> 鑾峰彇鍥㈤槦鎴愬憳璇锋眰鍙傛暟 @@ -832,56 +892,6 @@ <member name="P:Operater.DTO.Tk.GetTkBillRecordResponse.billRecords"> <summary> 璐﹀崟鏄庣粏 - </summary> - </member> - <member name="T:Operater.DTO.Tk.GetTkTradeListRequest"> - <summary> - 鑾峰彇璁㈠崟鏄庣粏璇锋眰鍙傛暟 - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.Id"> - <summary> - 浼氬憳Id - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.tid"> - <summary> - 璁㈠崟鍙� - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.stime"> - <summary> - 寮�濮嬫椂闂� - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.etime"> - <summary> - 缁撴潫鏃堕棿 - </summary> - </member> - <member name="T:Operater.DTO.Tk.GetTkTradeListResponse"> - <summary> - 鑾峰彇璁㈠崟鏄庣粏杩斿洖鍙傛暟 - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.PageNo"> - <summary> - 褰撳墠椤� - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.PageSize"> - <summary> - 鏉℃暟 - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.TotalCount"> - <summary> - 鎬绘暟 - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.TkTrades"> - <summary> - 璁㈠崟鏄庣粏 </summary> </member> </members> diff --git a/Operater.Common/obj/Debug/netcoreapp3.1/Operater.Common.csproj.AssemblyReference.cache b/Operater.Common/obj/Debug/netcoreapp3.1/Operater.Common.csproj.AssemblyReference.cache index 325c03f..0d2806c 100644 --- a/Operater.Common/obj/Debug/netcoreapp3.1/Operater.Common.csproj.AssemblyReference.cache +++ b/Operater.Common/obj/Debug/netcoreapp3.1/Operater.Common.csproj.AssemblyReference.cache Binary files differ diff --git a/Operater.Common/obj/Debug/netcoreapp3.1/Operater.Common.dll b/Operater.Common/obj/Debug/netcoreapp3.1/Operater.Common.dll index 5062588..6ec18e9 100644 --- a/Operater.Common/obj/Debug/netcoreapp3.1/Operater.Common.dll +++ b/Operater.Common/obj/Debug/netcoreapp3.1/Operater.Common.dll Binary files differ diff --git a/Operater.Common/obj/Debug/netcoreapp3.1/Operater.Common.pdb b/Operater.Common/obj/Debug/netcoreapp3.1/Operater.Common.pdb index d2dfda9..6420987 100644 --- a/Operater.Common/obj/Debug/netcoreapp3.1/Operater.Common.pdb +++ b/Operater.Common/obj/Debug/netcoreapp3.1/Operater.Common.pdb Binary files differ diff --git a/Operater.DTO/Operater.DTO.XML b/Operater.DTO/Operater.DTO.XML index 13f613c..47b9fc4 100644 --- a/Operater.DTO/Operater.DTO.XML +++ b/Operater.DTO/Operater.DTO.XML @@ -634,6 +634,61 @@ 鍟嗗搧杩炴帴鍦板潃 </summary> </member> + <member name="T:Operater.DTO.Tk.GetTkTradeListRequest"> + <summary> + 鑾峰彇璁㈠崟鏄庣粏璇锋眰鍙傛暟 + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.Id"> + <summary> + 浼氬憳Id + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.tid"> + <summary> + 璁㈠崟鍙� + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.stime"> + <summary> + 寮�濮嬫椂闂� + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.etime"> + <summary> + 缁撴潫鏃堕棿 + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.trade_status"> + <summary> + 1:宸蹭粯娆撅紝2锛氬凡瀹屾垚锛�3锛氬凡澶辨晥锛�4锛氬凡缁撶畻 + </summary> + </member> + <member name="T:Operater.DTO.Tk.GetTkTradeListResponse"> + <summary> + 鑾峰彇璁㈠崟鏄庣粏杩斿洖鍙傛暟 + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.PageNo"> + <summary> + 褰撳墠椤� + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.PageSize"> + <summary> + 鏉℃暟 + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.TotalCount"> + <summary> + 鎬绘暟 + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.TkTrades"> + <summary> + 璁㈠崟鏄庣粏 + </summary> + </member> <member name="T:Operater.DTO.Tk.GetOpenidRequest"> <summary> 鑾峰彇Openid璇锋眰鍙傛暟 @@ -764,6 +819,11 @@ 鍒涘缓娴锋姤浜岀淮鐮佽姹傚弬鏁� </summary> </member> + <member name="P:Operater.DTO.Tk.CreateQrCodeRequest.invite_code"> + <summary> + 閭�璇风爜 + </summary> + </member> <member name="T:Operater.DTO.Tk.GetTeamUserInfoRequest"> <summary> 鑾峰彇鍥㈤槦鎴愬憳璇锋眰鍙傛暟 @@ -832,56 +892,6 @@ <member name="P:Operater.DTO.Tk.GetTkBillRecordResponse.billRecords"> <summary> 璐﹀崟鏄庣粏 - </summary> - </member> - <member name="T:Operater.DTO.Tk.GetTkTradeListRequest"> - <summary> - 鑾峰彇璁㈠崟鏄庣粏璇锋眰鍙傛暟 - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.Id"> - <summary> - 浼氬憳Id - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.tid"> - <summary> - 璁㈠崟鍙� - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.stime"> - <summary> - 寮�濮嬫椂闂� - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.etime"> - <summary> - 缁撴潫鏃堕棿 - </summary> - </member> - <member name="T:Operater.DTO.Tk.GetTkTradeListResponse"> - <summary> - 鑾峰彇璁㈠崟鏄庣粏杩斿洖鍙傛暟 - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.PageNo"> - <summary> - 褰撳墠椤� - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.PageSize"> - <summary> - 鏉℃暟 - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.TotalCount"> - <summary> - 鎬绘暟 - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.TkTrades"> - <summary> - 璁㈠崟鏄庣粏 </summary> </member> </members> diff --git a/Operater.DTO/Tk/TkTradeDto.cs b/Operater.DTO/Tk/TkTradeDto.cs new file mode 100644 index 0000000..062b40e --- /dev/null +++ b/Operater.DTO/Tk/TkTradeDto.cs @@ -0,0 +1,59 @@ +锘縰sing Operater.DbModel; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Operater.DTO.Tk +{ + /// <summary> + /// 鑾峰彇璁㈠崟鏄庣粏璇锋眰鍙傛暟 + /// </summary> + public class GetTkTradeListRequest : PageBiz + { + /// <summary> + /// 浼氬憳Id + /// </summary> + public long Id { get; set; } + /// <summary> + /// 璁㈠崟鍙� + /// </summary> + public string tid { get; set; } + /// <summary> + /// 寮�濮嬫椂闂� + /// </summary> + public DateTime stime { get; set; } + + /// <summary> + /// 缁撴潫鏃堕棿 + /// </summary> + public DateTime etime { get; set; } + + /// <summary> + /// 1:宸蹭粯娆撅紝2锛氬凡瀹屾垚锛�3锛氬凡澶辨晥锛�4锛氬凡缁撶畻 + /// </summary> + public string trade_status { get; set; } + } + + /// <summary> + /// 鑾峰彇璁㈠崟鏄庣粏杩斿洖鍙傛暟 + /// </summary> + public class GetTkTradeListResponse + { + /// <summary> + /// 褰撳墠椤� + /// </summary> + public int PageNo { get; set; } + /// <summary> + /// 鏉℃暟 + /// </summary> + public int PageSize { get; set; } + /// <summary> + /// 鎬绘暟 + /// </summary> + public int TotalCount { get; set; } + /// <summary> + /// 璁㈠崟鏄庣粏 + /// </summary> + public List<TkTrade> TkTrades { get; set; } + } +} diff --git a/Operater.DTO/Tk/TkWxUtilDto.cs b/Operater.DTO/Tk/TkWxUtilDto.cs index c0a70ca..2b9b4c7 100644 --- a/Operater.DTO/Tk/TkWxUtilDto.cs +++ b/Operater.DTO/Tk/TkWxUtilDto.cs @@ -44,4 +44,9 @@ public string timestamp { get; set; } public string appid { get; set; } } + + public class GetwxacodeunlimitResponse: TkWxUtilDto + { + public string buffer { get; set; } + } } diff --git a/Operater.DTO/Tk/TxUserinfoDto.cs b/Operater.DTO/Tk/TxUserinfoDto.cs index aca5dc4..ad179f6 100644 --- a/Operater.DTO/Tk/TxUserinfoDto.cs +++ b/Operater.DTO/Tk/TxUserinfoDto.cs @@ -128,7 +128,10 @@ /// </summary> public class CreateQrCodeRequest { - public string url { get; set; } + /// <summary> + /// 閭�璇风爜 + /// </summary> + public string invite_code { get; set; } } /// <summary> @@ -211,50 +214,5 @@ public List<BillRecord> billRecords { get; set; } } - /// <summary> - /// 鑾峰彇璁㈠崟鏄庣粏璇锋眰鍙傛暟 - /// </summary> - public class GetTkTradeListRequest: PageBiz - { - /// <summary> - /// 浼氬憳Id - /// </summary> - public long Id { get; set; } - /// <summary> - /// 璁㈠崟鍙� - /// </summary> - public string tid { get; set; } - /// <summary> - /// 寮�濮嬫椂闂� - /// </summary> - public DateTime stime { get; set; } - /// <summary> - /// 缁撴潫鏃堕棿 - /// </summary> - public DateTime etime { get; set; } - } - - /// <summary> - /// 鑾峰彇璁㈠崟鏄庣粏杩斿洖鍙傛暟 - /// </summary> - public class GetTkTradeListResponse - { - /// <summary> - /// 褰撳墠椤� - /// </summary> - public int PageNo { get; set; } - /// <summary> - /// 鏉℃暟 - /// </summary> - public int PageSize { get; set; } - /// <summary> - /// 鎬绘暟 - /// </summary> - public int TotalCount { get; set; } - /// <summary> - /// 璁㈠崟鏄庣粏 - /// </summary> - public List<TkTrade> TkTrades { get; set; } - } } diff --git a/Operater.DTO/bin/Debug/netcoreapp3.1/Operater.DTO.XML b/Operater.DTO/bin/Debug/netcoreapp3.1/Operater.DTO.XML index 13f613c..47b9fc4 100644 --- a/Operater.DTO/bin/Debug/netcoreapp3.1/Operater.DTO.XML +++ b/Operater.DTO/bin/Debug/netcoreapp3.1/Operater.DTO.XML @@ -634,6 +634,61 @@ 鍟嗗搧杩炴帴鍦板潃 </summary> </member> + <member name="T:Operater.DTO.Tk.GetTkTradeListRequest"> + <summary> + 鑾峰彇璁㈠崟鏄庣粏璇锋眰鍙傛暟 + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.Id"> + <summary> + 浼氬憳Id + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.tid"> + <summary> + 璁㈠崟鍙� + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.stime"> + <summary> + 寮�濮嬫椂闂� + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.etime"> + <summary> + 缁撴潫鏃堕棿 + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.trade_status"> + <summary> + 1:宸蹭粯娆撅紝2锛氬凡瀹屾垚锛�3锛氬凡澶辨晥锛�4锛氬凡缁撶畻 + </summary> + </member> + <member name="T:Operater.DTO.Tk.GetTkTradeListResponse"> + <summary> + 鑾峰彇璁㈠崟鏄庣粏杩斿洖鍙傛暟 + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.PageNo"> + <summary> + 褰撳墠椤� + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.PageSize"> + <summary> + 鏉℃暟 + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.TotalCount"> + <summary> + 鎬绘暟 + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.TkTrades"> + <summary> + 璁㈠崟鏄庣粏 + </summary> + </member> <member name="T:Operater.DTO.Tk.GetOpenidRequest"> <summary> 鑾峰彇Openid璇锋眰鍙傛暟 @@ -764,6 +819,11 @@ 鍒涘缓娴锋姤浜岀淮鐮佽姹傚弬鏁� </summary> </member> + <member name="P:Operater.DTO.Tk.CreateQrCodeRequest.invite_code"> + <summary> + 閭�璇风爜 + </summary> + </member> <member name="T:Operater.DTO.Tk.GetTeamUserInfoRequest"> <summary> 鑾峰彇鍥㈤槦鎴愬憳璇锋眰鍙傛暟 @@ -832,56 +892,6 @@ <member name="P:Operater.DTO.Tk.GetTkBillRecordResponse.billRecords"> <summary> 璐﹀崟鏄庣粏 - </summary> - </member> - <member name="T:Operater.DTO.Tk.GetTkTradeListRequest"> - <summary> - 鑾峰彇璁㈠崟鏄庣粏璇锋眰鍙傛暟 - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.Id"> - <summary> - 浼氬憳Id - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.tid"> - <summary> - 璁㈠崟鍙� - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.stime"> - <summary> - 寮�濮嬫椂闂� - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.etime"> - <summary> - 缁撴潫鏃堕棿 - </summary> - </member> - <member name="T:Operater.DTO.Tk.GetTkTradeListResponse"> - <summary> - 鑾峰彇璁㈠崟鏄庣粏杩斿洖鍙傛暟 - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.PageNo"> - <summary> - 褰撳墠椤� - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.PageSize"> - <summary> - 鏉℃暟 - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.TotalCount"> - <summary> - 鎬绘暟 - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.TkTrades"> - <summary> - 璁㈠崟鏄庣粏 </summary> </member> </members> diff --git a/Operater.DTO/bin/Debug/netcoreapp3.1/Operater.DTO.dll b/Operater.DTO/bin/Debug/netcoreapp3.1/Operater.DTO.dll index d0d11b3..3d999ea 100644 --- a/Operater.DTO/bin/Debug/netcoreapp3.1/Operater.DTO.dll +++ b/Operater.DTO/bin/Debug/netcoreapp3.1/Operater.DTO.dll Binary files differ diff --git a/Operater.DTO/bin/Debug/netcoreapp3.1/Operater.DTO.pdb b/Operater.DTO/bin/Debug/netcoreapp3.1/Operater.DTO.pdb index 12d93f0..1ae52ba 100644 --- a/Operater.DTO/bin/Debug/netcoreapp3.1/Operater.DTO.pdb +++ b/Operater.DTO/bin/Debug/netcoreapp3.1/Operater.DTO.pdb Binary files differ diff --git a/Operater.DTO/obj/Debug/netcoreapp3.1/Operater.DTO.csproj.CoreCompileInputs.cache b/Operater.DTO/obj/Debug/netcoreapp3.1/Operater.DTO.csproj.CoreCompileInputs.cache index 5502455..a889b40 100644 --- a/Operater.DTO/obj/Debug/netcoreapp3.1/Operater.DTO.csproj.CoreCompileInputs.cache +++ b/Operater.DTO/obj/Debug/netcoreapp3.1/Operater.DTO.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -3e91313666d22dcc14acb3f0c8c737eb1ef14db1 +a61ebefed490117b60f97671b02cd2ff015a363f diff --git a/Operater.DTO/obj/Debug/netcoreapp3.1/Operater.DTO.dll b/Operater.DTO/obj/Debug/netcoreapp3.1/Operater.DTO.dll index d0d11b3..3d999ea 100644 --- a/Operater.DTO/obj/Debug/netcoreapp3.1/Operater.DTO.dll +++ b/Operater.DTO/obj/Debug/netcoreapp3.1/Operater.DTO.dll Binary files differ diff --git a/Operater.DTO/obj/Debug/netcoreapp3.1/Operater.DTO.pdb b/Operater.DTO/obj/Debug/netcoreapp3.1/Operater.DTO.pdb index 12d93f0..1ae52ba 100644 --- a/Operater.DTO/obj/Debug/netcoreapp3.1/Operater.DTO.pdb +++ b/Operater.DTO/obj/Debug/netcoreapp3.1/Operater.DTO.pdb Binary files differ diff --git a/Operater.DbModel/BillRecord.cs b/Operater.DbModel/BillRecord.cs index 2450bb2..9a580ba 100644 --- a/Operater.DbModel/BillRecord.cs +++ b/Operater.DbModel/BillRecord.cs @@ -42,5 +42,11 @@ ///</summary> [SugarColumn(ColumnName = "tid")] public int? tid { get; set; } + + /// <summary> + /// 骞冲彴锛歵b:娣樺疂 jd锛氫含涓� pdd:鎷煎澶� dy锛氭姈闊� + ///</summary> + [SugarColumn(ColumnName = "platfrom")] + public string platfrom { get; set; } } } diff --git a/Opreater.Service/bin/Debug/netcoreapp3.1/Operater.DTO.dll b/Opreater.Service/bin/Debug/netcoreapp3.1/Operater.DTO.dll index d0d11b3..3d999ea 100644 --- a/Opreater.Service/bin/Debug/netcoreapp3.1/Operater.DTO.dll +++ b/Opreater.Service/bin/Debug/netcoreapp3.1/Operater.DTO.dll Binary files differ diff --git a/Opreater.Service/bin/Debug/netcoreapp3.1/Operater.DTO.pdb b/Opreater.Service/bin/Debug/netcoreapp3.1/Operater.DTO.pdb index 12d93f0..1ae52ba 100644 --- a/Opreater.Service/bin/Debug/netcoreapp3.1/Operater.DTO.pdb +++ b/Opreater.Service/bin/Debug/netcoreapp3.1/Operater.DTO.pdb Binary files differ diff --git a/Opreater.Service/bin/Debug/netcoreapp3.1/Operater.DTO.xml b/Opreater.Service/bin/Debug/netcoreapp3.1/Operater.DTO.xml index 13f613c..47b9fc4 100644 --- a/Opreater.Service/bin/Debug/netcoreapp3.1/Operater.DTO.xml +++ b/Opreater.Service/bin/Debug/netcoreapp3.1/Operater.DTO.xml @@ -634,6 +634,61 @@ 鍟嗗搧杩炴帴鍦板潃 </summary> </member> + <member name="T:Operater.DTO.Tk.GetTkTradeListRequest"> + <summary> + 鑾峰彇璁㈠崟鏄庣粏璇锋眰鍙傛暟 + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.Id"> + <summary> + 浼氬憳Id + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.tid"> + <summary> + 璁㈠崟鍙� + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.stime"> + <summary> + 寮�濮嬫椂闂� + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.etime"> + <summary> + 缁撴潫鏃堕棿 + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.trade_status"> + <summary> + 1:宸蹭粯娆撅紝2锛氬凡瀹屾垚锛�3锛氬凡澶辨晥锛�4锛氬凡缁撶畻 + </summary> + </member> + <member name="T:Operater.DTO.Tk.GetTkTradeListResponse"> + <summary> + 鑾峰彇璁㈠崟鏄庣粏杩斿洖鍙傛暟 + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.PageNo"> + <summary> + 褰撳墠椤� + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.PageSize"> + <summary> + 鏉℃暟 + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.TotalCount"> + <summary> + 鎬绘暟 + </summary> + </member> + <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.TkTrades"> + <summary> + 璁㈠崟鏄庣粏 + </summary> + </member> <member name="T:Operater.DTO.Tk.GetOpenidRequest"> <summary> 鑾峰彇Openid璇锋眰鍙傛暟 @@ -764,6 +819,11 @@ 鍒涘缓娴锋姤浜岀淮鐮佽姹傚弬鏁� </summary> </member> + <member name="P:Operater.DTO.Tk.CreateQrCodeRequest.invite_code"> + <summary> + 閭�璇风爜 + </summary> + </member> <member name="T:Operater.DTO.Tk.GetTeamUserInfoRequest"> <summary> 鑾峰彇鍥㈤槦鎴愬憳璇锋眰鍙傛暟 @@ -832,56 +892,6 @@ <member name="P:Operater.DTO.Tk.GetTkBillRecordResponse.billRecords"> <summary> 璐﹀崟鏄庣粏 - </summary> - </member> - <member name="T:Operater.DTO.Tk.GetTkTradeListRequest"> - <summary> - 鑾峰彇璁㈠崟鏄庣粏璇锋眰鍙傛暟 - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.Id"> - <summary> - 浼氬憳Id - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.tid"> - <summary> - 璁㈠崟鍙� - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.stime"> - <summary> - 寮�濮嬫椂闂� - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListRequest.etime"> - <summary> - 缁撴潫鏃堕棿 - </summary> - </member> - <member name="T:Operater.DTO.Tk.GetTkTradeListResponse"> - <summary> - 鑾峰彇璁㈠崟鏄庣粏杩斿洖鍙傛暟 - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.PageNo"> - <summary> - 褰撳墠椤� - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.PageSize"> - <summary> - 鏉℃暟 - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.TotalCount"> - <summary> - 鎬绘暟 - </summary> - </member> - <member name="P:Operater.DTO.Tk.GetTkTradeListResponse.TkTrades"> - <summary> - 璁㈠崟鏄庣粏 </summary> </member> </members> diff --git a/Opreater.Service/bin/Debug/netcoreapp3.1/Operater.Service.dll b/Opreater.Service/bin/Debug/netcoreapp3.1/Operater.Service.dll index 33b945c..37e0956 100644 --- a/Opreater.Service/bin/Debug/netcoreapp3.1/Operater.Service.dll +++ b/Opreater.Service/bin/Debug/netcoreapp3.1/Operater.Service.dll Binary files differ diff --git a/Opreater.Service/bin/Debug/netcoreapp3.1/Operater.Service.pdb b/Opreater.Service/bin/Debug/netcoreapp3.1/Operater.Service.pdb index c1c24e6..307db5a 100644 --- a/Opreater.Service/bin/Debug/netcoreapp3.1/Operater.Service.pdb +++ b/Opreater.Service/bin/Debug/netcoreapp3.1/Operater.Service.pdb Binary files differ diff --git a/Opreater.Service/obj/Debug/netcoreapp3.1/Operater.Service.csproj.AssemblyReference.cache b/Opreater.Service/obj/Debug/netcoreapp3.1/Operater.Service.csproj.AssemblyReference.cache index 17f62f4..6fe775e 100644 --- a/Opreater.Service/obj/Debug/netcoreapp3.1/Operater.Service.csproj.AssemblyReference.cache +++ b/Opreater.Service/obj/Debug/netcoreapp3.1/Operater.Service.csproj.AssemblyReference.cache Binary files differ diff --git a/Opreater.Service/obj/Debug/netcoreapp3.1/Operater.Service.dll b/Opreater.Service/obj/Debug/netcoreapp3.1/Operater.Service.dll index 33b945c..37e0956 100644 --- a/Opreater.Service/obj/Debug/netcoreapp3.1/Operater.Service.dll +++ b/Opreater.Service/obj/Debug/netcoreapp3.1/Operater.Service.dll Binary files differ diff --git a/Opreater.Service/obj/Debug/netcoreapp3.1/Operater.Service.pdb b/Opreater.Service/obj/Debug/netcoreapp3.1/Operater.Service.pdb index c1c24e6..307db5a 100644 --- a/Opreater.Service/obj/Debug/netcoreapp3.1/Operater.Service.pdb +++ b/Opreater.Service/obj/Debug/netcoreapp3.1/Operater.Service.pdb Binary files differ -- Gitblit v1.9.3