no message

heyuntao

2023-05-05 cc09b6fe6ffac34a4eeeb26d313b187713cae0de

no message

 .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

 .vs/FxProject/DesignTimeBuild/.dtbcache.v2

Binary files differ

 .vs/FxProject/FileContentIndex/77b1bd10-3847-4daf-aec9-07a800fa2c76.vsidx

Binary files differ

 .vs/FxProject/FileContentIndex/c55a831d-fb02-44bd-bf28-e2e1f693aa76.vsidx

Binary files differ

 .vs/ProjectEvaluation/fxproject.metadata.v6.1

Binary files differ

 .vs/ProjectEvaluation/fxproject.projects.v6.1

Binary files differ

 .vs/TkProject/v17/.suo

Binary files differ

 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>

 Api.Operater/Controllers/TkTradeController.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,48 @@
using 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);
        }
    }
}

 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);
            }
        }

    }
}

 Api.Operater/bin/Debug/netcoreapp3.1/Api.Operater.dll

Binary files differ

 Api.Operater/bin/Debug/netcoreapp3.1/Api.Operater.pdb

Binary files differ

 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>

 Api.Operater/bin/Debug/netcoreapp3.1/Operater.Common.dll

Binary files differ

 Api.Operater/bin/Debug/netcoreapp3.1/Operater.Common.pdb

Binary files differ

 Api.Operater/bin/Debug/netcoreapp3.1/Operater.DTO.dll

Binary files differ

 Api.Operater/bin/Debug/netcoreapp3.1/Operater.DTO.pdb

Binary files differ

 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>

 Api.Operater/bin/Debug/netcoreapp3.1/Operater.Service.dll

Binary files differ

 Api.Operater/bin/Debug/netcoreapp3.1/Operater.Service.pdb

Binary files differ

 Api.Operater/obj/Debug/netcoreapp3.1/Api.Operater.csproj.AssemblyReference.cache

Binary files differ

 Api.Operater/obj/Debug/netcoreapp3.1/Api.Operater.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
54aef69b3d31332ef23b89322786bdca49f6e83c
e55800a62cab93fe26c9ce9415881095f5e807b3

 Api.Operater/obj/Debug/netcoreapp3.1/Api.Operater.dll

Binary files differ

 Api.Operater/obj/Debug/netcoreapp3.1/Api.Operater.pdb

Binary files differ

 Operater.Common/bin/Debug/netcoreapp3.1/Operater.Common.dll

Binary files differ

 Operater.Common/bin/Debug/netcoreapp3.1/Operater.Common.pdb

Binary files differ

 Operater.Common/bin/Debug/netcoreapp3.1/Operater.DTO.dll

Binary files differ

 Operater.Common/bin/Debug/netcoreapp3.1/Operater.DTO.pdb

Binary files differ

 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>

 Operater.Common/obj/Debug/netcoreapp3.1/Operater.Common.csproj.AssemblyReference.cache

Binary files differ

 Operater.Common/obj/Debug/netcoreapp3.1/Operater.Common.dll

Binary files differ

 Operater.Common/obj/Debug/netcoreapp3.1/Operater.Common.pdb

Binary files differ

 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>

 Operater.DTO/Tk/TkTradeDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,59 @@
using 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; }
    }
}

 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; }
    }
}

 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; }
    }
}

 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>

 Operater.DTO/bin/Debug/netcoreapp3.1/Operater.DTO.dll

Binary files differ

 Operater.DTO/bin/Debug/netcoreapp3.1/Operater.DTO.pdb

Binary files differ

 Operater.DTO/obj/Debug/netcoreapp3.1/Operater.DTO.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
3e91313666d22dcc14acb3f0c8c737eb1ef14db1
a61ebefed490117b60f97671b02cd2ff015a363f

 Operater.DTO/obj/Debug/netcoreapp3.1/Operater.DTO.dll

Binary files differ

 Operater.DTO/obj/Debug/netcoreapp3.1/Operater.DTO.pdb

Binary files differ

 Operater.DbModel/BillRecord.cs

@@ -42,5 +42,11 @@
        ///</summary>
        [SugarColumn(ColumnName = "tid")]
        public int? tid { get; set; }

        /// <summary>
        /// å¹³å°ï¼štb:淘宝 jd：京东 pdd:拼多多 dy：抖音
        ///</summary>
        [SugarColumn(ColumnName = "platfrom")]
        public string platfrom { get; set; }
    }
}

 Opreater.Service/bin/Debug/netcoreapp3.1/Operater.DTO.dll

Binary files differ

 Opreater.Service/bin/Debug/netcoreapp3.1/Operater.DTO.pdb

Binary files differ

 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>

 Opreater.Service/bin/Debug/netcoreapp3.1/Operater.Service.dll

Binary files differ

 Opreater.Service/bin/Debug/netcoreapp3.1/Operater.Service.pdb

Binary files differ

 Opreater.Service/obj/Debug/netcoreapp3.1/Operater.Service.csproj.AssemblyReference.cache

Binary files differ

 Opreater.Service/obj/Debug/netcoreapp3.1/Operater.Service.dll

Binary files differ

 Opreater.Service/obj/Debug/netcoreapp3.1/Operater.Service.pdb

Binary files differ