Skip to content
This repository has been archived by the owner on May 30, 2023. It is now read-only.

Commit

Permalink
Merge pull request #19 from marunrun/feature/session-select
Browse files Browse the repository at this point in the history
feat : session
  • Loading branch information
marunrun authored Jul 24, 2022
2 parents 5335cbe + e65cc79 commit ca32576
Show file tree
Hide file tree
Showing 5 changed files with 90 additions and 22 deletions.
71 changes: 54 additions & 17 deletions checkout/Form1.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 11 additions & 2 deletions checkout/Form1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,9 @@ private void handleTicket(string activtyId)
if (result.isSuccess() && result.result.sessions.Count > 0)
{

//todo 场次处理
//场次处理
sessionSelect.DataSource = result.result.sessions;


Session sessionOne = result.result.sessions[0];

Expand Down Expand Up @@ -355,7 +357,7 @@ private void buyTicket(DateTime buyTime)
var ticket = orderQo.ticket;
var apiParams = orderQo.apiParams;

buyTime = buyTime.AddMilliseconds(-200);
buyTime = buyTime.AddMilliseconds(-100);
var newApiParams = new Dictionary<string, object>(apiParams);
/*if (ticket.specialActivity == 4)
{
Expand Down Expand Up @@ -774,5 +776,12 @@ public void writeLog(string msg)
logText.AppendText(msg);
}
#endregion

private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
{
var session = (Session)sessionSelect.SelectedItem;

ticketList.DataSource = session.ticketList;
}
}
}
9 changes: 6 additions & 3 deletions checkout/Form1.resx
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,12 @@
<metadata name="activityInfoVoBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>628, 17</value>
</metadata>
<metadata name="sessionsBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>969, 51</value>
</metadata>
<metadata name="ticketListVoBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>847, 17</value>
</metadata>
<metadata name="couponInfoVoBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>234, 55</value>
</metadata>
Expand All @@ -135,9 +141,6 @@
<metadata name="userSessionBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>421, 17</value>
</metadata>
<metadata name="ticketListVoBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>847, 17</value>
</metadata>
<metadata name="buyTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>456, 55</value>
</metadata>
Expand Down
15 changes: 15 additions & 0 deletions checkout/checkout.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,25 @@
<NoWin32Manifest>true</NoWin32Manifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="BouncyCastle.Crypto, Version=1.9.0.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
<HintPath>..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll</HintPath>
</Reference>
<Reference Include="CheckBoxComboBox, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>bin\Debug\CheckBoxComboBox.dll</HintPath>
</Reference>
<Reference Include="MailKit, Version=3.3.0.0, Culture=neutral, PublicKeyToken=4e064fe7c44a8f1b, processorArchitecture=MSIL">
<HintPath>..\packages\MailKit.3.3.0\lib\net47\MailKit.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Edge.SeleniumTools, Version=3.141.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Edge.SeleniumTools.3.141.2\lib\net45\Microsoft.Edge.SeleniumTools.dll</HintPath>
</Reference>
<Reference Include="MimeKit, Version=3.3.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
<HintPath>..\packages\MimeKit.3.3.0\lib\net47\MimeKit.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
Expand All @@ -101,6 +110,10 @@
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.7.0.0-preview.1.22076.8\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Security" />
<Reference Include="System.Text.Encoding.CodePages, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encoding.CodePages.4.5.1\lib\net461\System.Text.Encoding.CodePages.dll</HintPath>
</Reference>
<Reference Include="System.Text.Encodings.Web, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
<HintPath>..\packages\System.Text.Encodings.Web.7.0.0-preview.1.22076.8\lib\net462\System.Text.Encodings.Web.dll</HintPath>
<Private>True</Private>
Expand Down Expand Up @@ -167,6 +180,7 @@
</Compile>
<Compile Include="Helper\Base62.cs" />
<Compile Include="Helper\CaptchHelper.cs" />
<Compile Include="Helper\EmailHelper.cs" />
<Compile Include="Helper\Helpers.cs" />
<Compile Include="Helper\LogHelpers.cs" />
<Compile Include="Helper\LongToStringConverter.cs" />
Expand All @@ -177,6 +191,7 @@
<Compile Include="Services\UserService.cs" />
<EmbeddedResource Include="Form1.resx">
<DependentUpon>Form1.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
Expand Down
4 changes: 4 additions & 0 deletions checkout/packages.config
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MailKit" version="3.3.0" targetFramework="net472" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net472" />
<package id="Microsoft.Edge.SeleniumTools" version="3.141.2" targetFramework="net472" />
<package id="MimeKit" version="3.3.0" targetFramework="net472" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
<package id="Portable.BouncyCastle" version="1.9.0" targetFramework="net472" />
<package id="Selenium.Support" version="3.141.0" targetFramework="net472" />
<package id="Selenium.WebDriver" version="3.141.0" targetFramework="net472" />
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
<package id="System.Memory" version="4.5.4" targetFramework="net472" />
<package id="System.Net.Http.Json" version="5.0.0" targetFramework="net472" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
<package id="System.Runtime.CompilerServices.Unsafe" version="7.0.0-preview.1.22076.8" targetFramework="net472" />
<package id="System.Text.Encoding.CodePages" version="4.5.1" targetFramework="net472" />
<package id="System.Text.Encodings.Web" version="7.0.0-preview.1.22076.8" targetFramework="net472" />
<package id="System.Text.Json" version="5.0.0" targetFramework="net472" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
Expand Down

0 comments on commit ca32576

Please sign in to comment.