tsai
/
EShop
mirror of https://github.com/EasyAbp/EShop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Upgraded PaymentService module to version 0.3.10

pull/87/head
gdlcf88 6 years ago
parent
511f9eef36
commit
cb7ce8d6fa
13 changed files with 3877 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp.EShop.Orders.Domain.csproj
  2. 2
      modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp.EShop.Payments.Domain.csproj
  3. 4
      samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj
  4. 4
      samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj
  5. 4
      samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj
  6. 12
      samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj
  7. 3589
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200624075154_UpgradedPaymentServiceModuleTo0_3_7.Designer.cs
  8. 219
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200624075154_UpgradedPaymentServiceModuleTo0_3_7.cs
  9. 58
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/EShopSampleMigrationsDbContextModelSnapshot.cs
  10. 4
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj
  11. 4
      samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj
  12. 4
      samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj
  13. 4
      samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj

2
modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Domain/EasyAbp.EShop.Orders.Domain.csproj
View File

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="0.3.6" />
<PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="0.3.10" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="2.9.0" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="2.9.0" />
<ProjectReference Include="..\..\..\EasyAbp.EShop.Payments\src\EasyAbp.EShop.Payments.Domain.Shared\EasyAbp.EShop.Payments.Domain.Shared.csproj" />

2
modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain/EasyAbp.EShop.Payments.Domain.csproj
View File

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="0.3.6" />
<PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="0.3.10" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="2.9.0" />
<PackageReference Include="Volo.Abp.Ddd.Domain" Version="2.9.0" />
<ProjectReference Include="..\..\..\EasyAbp.EShop.Stores\src\EasyAbp.EShop.Stores.Domain.Shared\EasyAbp.EShop.Stores.Domain.Shared.csproj" />

4
samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj
View File

@ -13,8 +13,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="EasyAbp.PaymentService.Application.Contracts" Version="0.3.6" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.Application.Contracts" Version="0.3.6" />
<PackageReference Include="EasyAbp.PaymentService.Application.Contracts" Version="0.3.10" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.Application.Contracts" Version="0.3.10" />
<PackageReference Include="Volo.Abp.ObjectExtending" Version="2.9.0" />
<PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="2.9.0" />
<PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="2.9.0" />

4
samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj
View File

@ -14,8 +14,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="EasyAbp.PaymentService.Application" Version="0.3.6" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.Application" Version="0.3.6" />
<PackageReference Include="EasyAbp.PaymentService.Application" Version="0.3.10" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.Application" Version="0.3.10" />
<PackageReference Include="Volo.Abp.Account.Application" Version="2.9.0" />
<PackageReference Include="Volo.Abp.Identity.Application" Version="2.9.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="2.9.0" />

4
samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj
View File

@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="0.3.6" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.Domain.Shared" Version="0.3.6" />
<PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="0.3.10" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.Domain.Shared" Version="0.3.10" />
<PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="2.9.0" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="2.9.0" />
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="2.9.0" />

12
samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj
View File

@ -13,8 +13,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="EasyAbp.PaymentService.Domain" Version="0.3.6" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.Domain" Version="0.3.6" />
<PackageReference Include="EasyAbp.PaymentService.Domain" Version="0.3.10" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.Domain" Version="0.3.10" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.2.0" />
<PackageReference Include="Volo.Abp.Identity.Domain" Version="2.9.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="2.9.0" />
@ -27,4 +27,12 @@
<PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="2.9.0" />
</ItemGroup>
<ItemGroup>
<Folder Include="EasyAbp\PaymentService\WeChatPay" />
</ItemGroup>
<ItemGroup>
<Compile Remove="EasyAbp\PaymentService\WeChatPay\TestPaymentOpenIdProvider.cs" />
</ItemGroup>
</Project>

3589
samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200624075154_UpgradedPaymentServiceModuleTo0_3_7.Designer.cs
View File

File diff suppressed because it is too large

219
samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200624075154_UpgradedPaymentServiceModuleTo0_3_7.cs
View File

@ -0,0 +1,219 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace EShopSample.Migrations
{
public partial class UpgradedPaymentServiceModuleTo0_3_7 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "NonceStr",
table: "PaymentServiceWeChatPayRefundRecords");
migrationBuilder.DropColumn(
name: "ReqInfo",
table: "PaymentServiceWeChatPayRefundRecords");
migrationBuilder.DropColumn(
name: "NonceStr",
table: "PaymentServiceWeChatPayPaymentRecords");
migrationBuilder.DropColumn(
name: "Sign",
table: "PaymentServiceWeChatPayPaymentRecords");
migrationBuilder.DropColumn(
name: "SignType",
table: "PaymentServiceWeChatPayPaymentRecords");
migrationBuilder.AlterColumn<int>(
name: "SettlementRefundFee",
table: "PaymentServiceWeChatPayRefundRecords",
nullable: true,
oldClrType: typeof(int),
oldType: "int");
migrationBuilder.AddColumn<int>(
name: "CashFee",
table: "PaymentServiceWeChatPayRefundRecords",
nullable: false,
defaultValue: 0);
migrationBuilder.AddColumn<string>(
name: "CashFeeType",
table: "PaymentServiceWeChatPayRefundRecords",
nullable: true);
migrationBuilder.AddColumn<int>(
name: "CashRefundFee",
table: "PaymentServiceWeChatPayRefundRecords",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CouponIds",
table: "PaymentServiceWeChatPayRefundRecords",
nullable: true);
migrationBuilder.AddColumn<int>(
name: "CouponRefundCount",
table: "PaymentServiceWeChatPayRefundRecords",
nullable: true);
migrationBuilder.AddColumn<int>(
name: "CouponRefundFee",
table: "PaymentServiceWeChatPayRefundRecords",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CouponRefundFees",
table: "PaymentServiceWeChatPayRefundRecords",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "CouponTypes",
table: "PaymentServiceWeChatPayRefundRecords",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "FeeType",
table: "PaymentServiceWeChatPayRefundRecords",
nullable: true);
migrationBuilder.AddColumn<DateTime>(
name: "CancelledTime",
table: "PaymentServiceRefunds",
nullable: true);
migrationBuilder.AddColumn<DateTime>(
name: "CompletedTime",
table: "PaymentServiceRefunds",
nullable: true);
migrationBuilder.AddColumn<decimal>(
name: "PendingRefundAmount",
table: "PaymentServicePayments",
type: "decimal(18,6)",
nullable: false,
defaultValue: 0m);
migrationBuilder.AddColumn<decimal>(
name: "PendingRefundAmount",
table: "PaymentServicePaymentItems",
type: "decimal(18,6)",
nullable: false,
defaultValue: 0m);
migrationBuilder.CreateIndex(
name: "IX_PaymentServiceWeChatPayRefundRecords_PaymentId",
table: "PaymentServiceWeChatPayRefundRecords",
column: "PaymentId");
migrationBuilder.CreateIndex(
name: "IX_PaymentServiceWeChatPayPaymentRecords_PaymentId",
table: "PaymentServiceWeChatPayPaymentRecords",
column: "PaymentId");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropIndex(
name: "IX_PaymentServiceWeChatPayRefundRecords_PaymentId",
table: "PaymentServiceWeChatPayRefundRecords");
migrationBuilder.DropIndex(
name: "IX_PaymentServiceWeChatPayPaymentRecords_PaymentId",
table: "PaymentServiceWeChatPayPaymentRecords");
migrationBuilder.DropColumn(
name: "CashFee",
table: "PaymentServiceWeChatPayRefundRecords");
migrationBuilder.DropColumn(
name: "CashFeeType",
table: "PaymentServiceWeChatPayRefundRecords");
migrationBuilder.DropColumn(
name: "CashRefundFee",
table: "PaymentServiceWeChatPayRefundRecords");
migrationBuilder.DropColumn(
name: "CouponIds",
table: "PaymentServiceWeChatPayRefundRecords");
migrationBuilder.DropColumn(
name: "CouponRefundCount",
table: "PaymentServiceWeChatPayRefundRecords");
migrationBuilder.DropColumn(
name: "CouponRefundFee",
table: "PaymentServiceWeChatPayRefundRecords");
migrationBuilder.DropColumn(
name: "CouponRefundFees",
table: "PaymentServiceWeChatPayRefundRecords");
migrationBuilder.DropColumn(
name: "CouponTypes",
table: "PaymentServiceWeChatPayRefundRecords");
migrationBuilder.DropColumn(
name: "FeeType",
table: "PaymentServiceWeChatPayRefundRecords");
migrationBuilder.DropColumn(
name: "CancelledTime",
table: "PaymentServiceRefunds");
migrationBuilder.DropColumn(
name: "CompletedTime",
table: "PaymentServiceRefunds");
migrationBuilder.DropColumn(
name: "PendingRefundAmount",
table: "PaymentServicePayments");
migrationBuilder.DropColumn(
name: "PendingRefundAmount",
table: "PaymentServicePaymentItems");
migrationBuilder.AlterColumn<int>(
name: "SettlementRefundFee",
table: "PaymentServiceWeChatPayRefundRecords",
type: "int",
nullable: false,
oldClrType: typeof(int),
oldNullable: true);
migrationBuilder.AddColumn<string>(
name: "NonceStr",
table: "PaymentServiceWeChatPayRefundRecords",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ReqInfo",
table: "PaymentServiceWeChatPayRefundRecords",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "NonceStr",
table: "PaymentServiceWeChatPayPaymentRecords",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "Sign",
table: "PaymentServiceWeChatPayPaymentRecords",
type: "nvarchar(max)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "SignType",
table: "PaymentServiceWeChatPayPaymentRecords",
type: "nvarchar(max)",
nullable: true);
}
}
}

58
samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/EShopSampleMigrationsDbContextModelSnapshot.cs
View File

@ -1217,6 +1217,9 @@ namespace EShopSample.Migrations
b.Property<string>("PaymentMethod")
.HasColumnType("nvarchar(max)");
b.Property<decimal>("PendingRefundAmount")
.HasColumnType("decimal(18,6)");
b.Property<decimal>("RefundAmount")
.HasColumnType("decimal(18,6)");
@ -1289,6 +1292,9 @@ namespace EShopSample.Migrations
b.Property<Guid?>("PaymentId")
.HasColumnType("uniqueidentifier");
b.Property<decimal>("PendingRefundAmount")
.HasColumnType("decimal(18,6)");
b.Property<decimal>("RefundAmount")
.HasColumnType("decimal(18,6)");
@ -1305,6 +1311,12 @@ namespace EShopSample.Migrations
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("CancelledTime")
.HasColumnType("datetime2");
b.Property<DateTime?>("CompletedTime")
.HasColumnType("datetime2");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp")
@ -1448,9 +1460,6 @@ namespace EShopSample.Migrations
b.Property<string>("MchId")
.HasColumnType("nvarchar(max)");
b.Property<string>("NonceStr")
.HasColumnType("nvarchar(max)");
b.Property<string>("Openid")
.HasColumnType("nvarchar(max)");
@ -1472,12 +1481,6 @@ namespace EShopSample.Migrations
b.Property<int?>("SettlementTotalFee")
.HasColumnType("int");
b.Property<string>("Sign")
.HasColumnType("nvarchar(max)");
b.Property<string>("SignType")
.HasColumnType("nvarchar(max)");
b.Property<Guid?>("TenantId")
.HasColumnName("TenantId")
.HasColumnType("uniqueidentifier");
@ -1496,6 +1499,8 @@ namespace EShopSample.Migrations
b.HasKey("Id");
b.HasIndex("PaymentId");
b.ToTable("PaymentServiceWeChatPayPaymentRecords");
});
@ -1508,11 +1513,35 @@ namespace EShopSample.Migrations
b.Property<string>("AppId")
.HasColumnType("nvarchar(max)");
b.Property<int>("CashFee")
.HasColumnType("int");
b.Property<string>("CashFeeType")
.HasColumnType("nvarchar(max)");
b.Property<int?>("CashRefundFee")
.HasColumnType("int");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnName("ConcurrencyStamp")
.HasColumnType("nvarchar(max)");
b.Property<string>("CouponIds")
.HasColumnType("nvarchar(max)");
b.Property<int?>("CouponRefundCount")
.HasColumnType("int");
b.Property<int?>("CouponRefundFee")
.HasColumnType("int");
b.Property<string>("CouponRefundFees")
.HasColumnType("nvarchar(max)");
b.Property<string>("CouponTypes")
.HasColumnType("nvarchar(max)");
b.Property<DateTime>("CreationTime")
.HasColumnName("CreationTime")
.HasColumnType("datetime2");
@ -1525,10 +1554,10 @@ namespace EShopSample.Migrations
.HasColumnName("ExtraProperties")
.HasColumnType("nvarchar(max)");
b.Property<string>("MchId")
b.Property<string>("FeeType")
.HasColumnType("nvarchar(max)");
b.Property<string>("NonceStr")
b.Property<string>("MchId")
.HasColumnType("nvarchar(max)");
b.Property<string>("OutRefundNo")
@ -1558,16 +1587,13 @@ namespace EShopSample.Migrations
b.Property<string>("RefundStatus")
.HasColumnType("nvarchar(max)");
b.Property<string>("ReqInfo")
.HasColumnType("nvarchar(max)");
b.Property<string>("ReturnCode")
.HasColumnType("nvarchar(max)");
b.Property<string>("ReturnMsg")
.HasColumnType("nvarchar(max)");
b.Property<int>("SettlementRefundFee")
b.Property<int?>("SettlementRefundFee")
.HasColumnType("int");
b.Property<int?>("SettlementTotalFee")
@ -1588,6 +1614,8 @@ namespace EShopSample.Migrations
b.HasKey("Id");
b.HasIndex("PaymentId");
b.ToTable("PaymentServiceWeChatPayRefundRecords");
});

4
samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj
View File

@ -10,8 +10,8 @@
<ItemGroup>
<ProjectReference Include="..\..\..\..\..\integration\EasyAbp.EShop\src\EasyAbp.EShop.EntityFrameworkCore\EasyAbp.EShop.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\EShopSample.Domain\EShopSample.Domain.csproj" />
<PackageReference Include="EasyAbp.PaymentService.EntityFrameworkCore" Version="0.3.6" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.EntityFrameworkCore" Version="0.3.6" />
<PackageReference Include="EasyAbp.PaymentService.EntityFrameworkCore" Version="0.3.10" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.EntityFrameworkCore" Version="0.3.10" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="2.9.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="2.9.0" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="2.9.0" />

4
samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj
View File

@ -13,8 +13,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="EasyAbp.PaymentService.HttpApi.Client" Version="0.3.6" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.HttpApi.Client" Version="0.3.6" />
<PackageReference Include="EasyAbp.PaymentService.HttpApi.Client" Version="0.3.10" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.HttpApi.Client" Version="0.3.10" />
<PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="2.9.0" />
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="2.9.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="2.9.0" />

4
samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj
View File

@ -13,8 +13,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="EasyAbp.PaymentService.HttpApi" Version="0.3.6" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.HttpApi" Version="0.3.6" />
<PackageReference Include="EasyAbp.PaymentService.HttpApi" Version="0.3.10" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.HttpApi" Version="0.3.10" />
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="2.9.0" />
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="2.9.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="2.9.0" />

4
samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj
View File

@ -45,8 +45,8 @@
<ProjectReference Include="..\EShopSample.Application\EShopSample.Application.csproj" />
<ProjectReference Include="..\EShopSample.HttpApi\EShopSample.HttpApi.csproj" />
<ProjectReference Include="..\EShopSample.EntityFrameworkCore.DbMigrations\EShopSample.EntityFrameworkCore.DbMigrations.csproj" />
<PackageReference Include="EasyAbp.PaymentService.Web" Version="0.3.6" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.Web" Version="0.3.6" />
<PackageReference Include="EasyAbp.PaymentService.Web" Version="0.3.10" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.Web" Version="0.3.10" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="2.9.0" />
<PackageReference Include="Volo.Abp.Autofac" Version="2.9.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="2.9.0" />

Write Preview
Loading…
Cancel
Save