Merge pull request #71 from EasyAbp/abp8.1

Upgrade to ABP 8.1.0
EasyAbp · Apr 14, 2024 · 94f0bbc · 94f0bbc
2 parents 34503f6 + 91768bc
commit 94f0bbc
Show file tree

Hide file tree

Showing 61 changed files with 11,785 additions and 13,713 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
  <PropertyGroup>
 
- <AbpVersion>8.0.0</AbpVersion>
- <EasyAbpAbpWeChatModuleVersion>2.9.0</EasyAbpAbpWeChatModuleVersion>
+ <AbpVersion>8.1.0</AbpVersion>
+ <EasyAbpAbpWeChatModuleVersion>3.1.0</EasyAbpAbpWeChatModuleVersion>
 
  </PropertyGroup>
 </Project>
diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
  <PropertyGroup>
  <LangVersion>latest</LangVersion>
- <Version>2.10.0</Version>
+ <Version>2.11.0</Version>
  <NoWarn>$(NoWarn);CS1591</NoWarn>
  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
  <Authors>EasyAbp Team</Authors>

diff --git a/docs/WeChatPay/README.md b/docs/WeChatPay/README.md
@@ -74,12 +74,14 @@ WeChatPay implementation of the EasyAbp.PaymentService module.
  {
  "extraProperties": {
  "trade_type": "JSAPI",
- "appid": "wx81a2956875268fk8" // You can specify an appid or get it from the input from the client.
+ "appid": "wx81a2956875268fk8"
  "mch_id": "10000100" // If it's null, use the default settings/options value you configured in the Abp.WeChat.Pay module.
  }
  }
  ```
 
+ Then you can get a `prepay_id` or `code_url` from the extraProperty in the result. Refer to the [WeChatPay V3 docs](https://pay.weixin.qq.com/docs/merchant/products/jsapi-payment/introduction.html) to continue the payment. This module can receive and allow you to handle the payment success event.
+
  > Skip the following steps if you are using the [EasyAbp.EShop](https://github.com/EasyAbp/EShop).
 
  <details>

diff --git a/...cation.Contracts/EasyAbp/PaymentService/WeChatPay/PaymentRecords/Dtos/PaymentRecordDto.cs b/...cation.Contracts/EasyAbp/PaymentService/WeChatPay/PaymentRecords/Dtos/PaymentRecordDto.cs
@@ -8,14 +8,30 @@ public class PaymentRecordDto : ExtensibleCreationAuditedEntityDto<Guid>
  {
  public Guid PaymentId { get; set; }
 
- public string ReturnCode { get; set; }
-
- public string ReturnMsg { get; set; }
+ #region Common
 
  public string AppId { get; set; }
 
  public string MchId { get; set; }
 
+ public string OutTradeNo { get; set; }
+
+ public string TransactionId { get; set; }
+
+ public string TradeType { get; set; }
+
+ public string BankType { get; set; }
+
+ public string Attach { get; set; }
+
+ #endregion
+
+ #region V2-only
+
+ public string ReturnCode { get; set; }
+
+ public string ReturnMsg { get; set; }
+
  public string DeviceInfo { get; set; }
 
  public string ResultCode { get; set; }
@@ -28,10 +44,6 @@ public class PaymentRecordDto : ExtensibleCreationAuditedEntityDto<Guid>
 
  public string IsSubscribe { get; set; }
 
- public string TradeType { get; set; }
-
- public string BankType { get; set; }
-
  public int TotalFee { get; set; }
 
  public int? SettlementTotalFee { get; set; }
@@ -52,12 +64,38 @@ public class PaymentRecordDto : ExtensibleCreationAuditedEntityDto<Guid>
 
  public string CouponFees { get; set; }
 
- public string TransactionId { get; set; }
+ public string TimeEnd { get; set; }
 
- public string OutTradeNo { get; set; }
+ #endregion
 
- public string Attach { get; set; }
+ #region V3-only
 
- public string TimeEnd { get; set; }
+ public string TradeState { get; set; }
+
+ public string TradeStateDesc { get; set; }
+
+ public string SuccessTime { get; set; }
+
+ /// <summary>
+ /// Serialized Payer object
+ /// </summary>
+ public string Payer { get; set; }
+
+ /// <summary>
+ /// Serialized Amount object
+ /// </summary>
+ public string Amount { get; set; }
+
+ /// <summary>
+ /// Serialized SceneInfo object
+ /// </summary>
+ public string SceneInfo { get; set; }
+
+ /// <summary>
+ /// Serialized PromotionDetail object
+ /// </summary>
+ public string PromotionDetail { get; set; }
+
+ #endregion
  }
 }
diff --git a/...lication.Contracts/EasyAbp/PaymentService/WeChatPay/RefundRecords/Dtos/RefundRecordDto.cs b/...lication.Contracts/EasyAbp/PaymentService/WeChatPay/RefundRecords/Dtos/RefundRecordDto.cs
@@ -8,6 +8,20 @@ public class RefundRecordDto : ExtensibleCreationAuditedEntityDto<Guid>
  {
  public Guid PaymentId { get; set; }
 
+ #region Common
+
+ public string OutRefundNo { get; set; }
+
+ public string TransactionId { get; set; }
+
+ public string OutTradeNo { get; set; }
+
+ public string SuccessTime { get; set; }
+
+ #endregion
+
+ #region V2-only
+
  public string ReturnCode { get; set; }
 
  public string ReturnMsg { get; set; }
@@ -16,48 +30,69 @@ public class RefundRecordDto : ExtensibleCreationAuditedEntityDto<Guid>
 
  public string MchId { get; set; }
 
- public string TransactionId { get; set; }
-
- public string OutTradeNo { get; set; }
-
  public string RefundId { get; set; }
 
- public string OutRefundNo { get; set; }
-
  public int TotalFee { get; set; }
 
  public int? SettlementTotalFee { get; set; }
 
  public int RefundFee { get; set; }
 
- public int SettlementRefundFee { get; set; }
+ public int? SettlementRefundFee { get; set; }
 
  public string FeeType { get; set; }
- 
+
  public int CashFee { get; set; }
- 
+
  public string CashFeeType { get; set; }
- 
+
  public int? CashRefundFee { get; set; }
 
  public int? CouponRefundFee { get; set; }
- 
+
  public int? CouponRefundCount { get; set; }
- 
+
  public string CouponTypes { get; set; }
- 
+
  public string CouponIds { get; set; }
- 
+
  public string CouponRefundFees { get; set; }
-
- public string RefundStatus { get; set; }
 
- public string SuccessTime { get; set; }
+ public string RefundStatus { get; set; }
 
+ /// <summary>
+ /// It's really named "Accout" by stupid WeChat team!
+ /// </summary>
  public string RefundRecvAccout { get; set; }
 
  public string RefundAccount { get; set; }
 
  public string RefundRequestSource { get; set; }
+
+ #endregion
+
+ #region V3-only
+
+ public string Channel { get; set; }
+
+ public string UserReceivedAccount { get; set; }
+
+ public string CreateTime { get; set; }
+
+ public string Status { get; set; }
+
+ public string FundsAccount { get; set; }
+
+ /// <summary>
+ /// Serialized Amount object
+ /// </summary>
+ public string Amount { get; set; }
+
+ /// <summary>
+ /// Serialized array[Promotion] object
+ /// </summary>
+ public string PromotionDetail { get; set; }
+
+ #endregion
  }
 }
diff --git a/...e.WeChatPay.Domain.Shared/EasyAbp/PaymentService/WeChatPay/Localization/WeChatPay/cs.json b/...e.WeChatPay.Domain.Shared/EasyAbp/PaymentService/WeChatPay/Localization/WeChatPay/cs.json
@@ -35,6 +35,13 @@
  "RefundRecordRefundRecvAccout": "RefundRecvAccout",
  "RefundRecordRefundAccount": "RefundAccount",
  "RefundRecordRefundRequestSource": "RefundRequestSource",
+ "RefundRecordChannel": "Channel",
+ "RefundRecordUserReceivedAccount": "UserReceivedAccount",
+ "RefundRecordCreateTime": "CreateTime",
+ "RefundRecordStatus": "Status",
+ "RefundRecordFundsAccount": "FundsAccount",
+ "RefundRecordAmount": "Amount",
+ "RefundRecordPromotionDetail": "PromotionDetail",
  "SuccessfullyDeleted": "Successfully deleted",
  "Menu:PaymentRecord": "Payment record",
  "PaymentRecord": "Payment record",
@@ -64,6 +71,13 @@
  "PaymentRecordTransactionId": "TransactionId",
  "PaymentRecordOutTradeNo": "OutTradeNo",
  "PaymentRecordAttach": "Attach",
- "PaymentRecordTimeEnd": "TimeEnd"
+ "PaymentRecordTimeEnd": "TimeEnd",
+ "PaymentRecordTradeState": "TradeState",
+ "PaymentRecordTradeStateDesc": "TradeStateDesc",
+ "PaymentRecordSuccessTime": "SuccessTime",
+ "PaymentRecordPayer": "Payer",
+ "PaymentRecordAmount": "Amount",
+ "PaymentRecordSceneInfo": "SceneInfo",
+ "PaymentRecordPromotionDetail": "PromotionDetail"
  }
 }
diff --git a/...e.WeChatPay.Domain.Shared/EasyAbp/PaymentService/WeChatPay/Localization/WeChatPay/en.json b/...e.WeChatPay.Domain.Shared/EasyAbp/PaymentService/WeChatPay/Localization/WeChatPay/en.json
@@ -35,6 +35,13 @@
  "RefundRecordRefundRecvAccout": "RefundRecvAccout",
  "RefundRecordRefundAccount": "RefundAccount",
  "RefundRecordRefundRequestSource": "RefundRequestSource",
+ "RefundRecordChannel": "Channel",
+ "RefundRecordUserReceivedAccount": "UserReceivedAccount",
+ "RefundRecordCreateTime": "CreateTime",
+ "RefundRecordStatus": "Status",
+ "RefundRecordFundsAccount": "FundsAccount",
+ "RefundRecordAmount": "Amount",
+ "RefundRecordPromotionDetail": "PromotionDetail",
  "SuccessfullyDeleted": "Successfully deleted",
  "Menu:PaymentRecord": "Payment record",
  "PaymentRecord": "Payment record",
@@ -64,6 +71,13 @@
  "PaymentRecordTransactionId": "TransactionId",
  "PaymentRecordOutTradeNo": "OutTradeNo",
  "PaymentRecordAttach": "Attach",
- "PaymentRecordTimeEnd": "TimeEnd"
+ "PaymentRecordTimeEnd": "TimeEnd",
+ "PaymentRecordTradeState": "TradeState",
+ "PaymentRecordTradeStateDesc": "TradeStateDesc",
+ "PaymentRecordSuccessTime": "SuccessTime",
+ "PaymentRecordPayer": "Payer",
+ "PaymentRecordAmount": "Amount",
+ "PaymentRecordSceneInfo": "SceneInfo",
+ "PaymentRecordPromotionDetail": "PromotionDetail"
  }
 }
diff --git a/...e.WeChatPay.Domain.Shared/EasyAbp/PaymentService/WeChatPay/Localization/WeChatPay/pl.json b/...e.WeChatPay.Domain.Shared/EasyAbp/PaymentService/WeChatPay/Localization/WeChatPay/pl.json
@@ -35,6 +35,13 @@
  "RefundRecordRefundRecvAccout": "RefundRecvAccout",
  "RefundRecordRefundAccount": "RefundAccount",
  "RefundRecordRefundRequestSource": "RefundRequestSource",
+ "RefundRecordChannel": "Channel",
+ "RefundRecordUserReceivedAccount": "UserReceivedAccount",
+ "RefundRecordCreateTime": "CreateTime",
+ "RefundRecordStatus": "Status",
+ "RefundRecordFundsAccount": "FundsAccount",
+ "RefundRecordAmount": "Amount",
+ "RefundRecordPromotionDetail": "PromotionDetail",
  "SuccessfullyDeleted": "Successfully deleted",
  "Menu:PaymentRecord": "Payment record",
  "PaymentRecord": "Payment record",
@@ -64,6 +71,13 @@
  "PaymentRecordTransactionId": "TransactionId",
  "PaymentRecordOutTradeNo": "OutTradeNo",
  "PaymentRecordAttach": "Attach",
- "PaymentRecordTimeEnd": "TimeEnd"
+ "PaymentRecordTimeEnd": "TimeEnd",
+ "PaymentRecordTradeState": "TradeState",
+ "PaymentRecordTradeStateDesc": "TradeStateDesc",
+ "PaymentRecordSuccessTime": "SuccessTime",
+ "PaymentRecordPayer": "Payer",
+ "PaymentRecordAmount": "Amount",
+ "PaymentRecordSceneInfo": "SceneInfo",
+ "PaymentRecordPromotionDetail": "PromotionDetail"
  }
 }
diff --git a/...eChatPay.Domain.Shared/EasyAbp/PaymentService/WeChatPay/Localization/WeChatPay/pt-BR.json b/...eChatPay.Domain.Shared/EasyAbp/PaymentService/WeChatPay/Localization/WeChatPay/pt-BR.json
@@ -35,6 +35,13 @@
  "RefundRecordRefundRecvAccout": "RefundRecvAccout",
  "RefundRecordRefundAccount": "RefundAccount",
  "RefundRecordRefundRequestSource": "RefundRequestSource",
+ "RefundRecordChannel": "Channel",
+ "RefundRecordUserReceivedAccount": "UserReceivedAccount",
+ "RefundRecordCreateTime": "CreateTime",
+ "RefundRecordStatus": "Status",
+ "RefundRecordFundsAccount": "FundsAccount",
+ "RefundRecordAmount": "Amount",
+ "RefundRecordPromotionDetail": "PromotionDetail",
  "SuccessfullyDeleted": "Successfully deleted",
  "Menu:PaymentRecord": "Payment record",
  "PaymentRecord": "Payment record",
@@ -64,6 +71,13 @@
  "PaymentRecordTransactionId": "TransactionId",
  "PaymentRecordOutTradeNo": "OutTradeNo",
  "PaymentRecordAttach": "Attach",
- "PaymentRecordTimeEnd": "TimeEnd"
+ "PaymentRecordTimeEnd": "TimeEnd",
+ "PaymentRecordTradeState": "TradeState",
+ "PaymentRecordTradeStateDesc": "TradeStateDesc",
+ "PaymentRecordSuccessTime": "SuccessTime",
+ "PaymentRecordPayer": "Payer",
+ "PaymentRecordAmount": "Amount",
+ "PaymentRecordSceneInfo": "SceneInfo",
+ "PaymentRecordPromotionDetail": "PromotionDetail"
  }
 }
diff --git a/...e.WeChatPay.Domain.Shared/EasyAbp/PaymentService/WeChatPay/Localization/WeChatPay/sl.json b/...e.WeChatPay.Domain.Shared/EasyAbp/PaymentService/WeChatPay/Localization/WeChatPay/sl.json
@@ -35,6 +35,13 @@
  "RefundRecordRefundRecvAccout": "RefundRecvAccout",
  "RefundRecordRefundAccount": "RefundAccount",
  "RefundRecordRefundRequestSource": "RefundRequestSource",
+ "RefundRecordChannel": "Channel",
+ "RefundRecordUserReceivedAccount": "UserReceivedAccount",
+ "RefundRecordCreateTime": "CreateTime",
+ "RefundRecordStatus": "Status",
+ "RefundRecordFundsAccount": "FundsAccount",
+ "RefundRecordAmount": "Amount",
+ "RefundRecordPromotionDetail": "PromotionDetail",
  "SuccessfullyDeleted": "Successfully deleted",
  "Menu:PaymentRecord": "Payment record",
  "PaymentRecord": "Payment record",
@@ -64,6 +71,13 @@
  "PaymentRecordTransactionId": "TransactionId",
  "PaymentRecordOutTradeNo": "OutTradeNo",
  "PaymentRecordAttach": "Attach",
- "PaymentRecordTimeEnd": "TimeEnd"
+ "PaymentRecordTimeEnd": "TimeEnd",
+ "PaymentRecordTradeState": "TradeState",
+ "PaymentRecordTradeStateDesc": "TradeStateDesc",
+ "PaymentRecordSuccessTime": "SuccessTime",
+ "PaymentRecordPayer": "Payer",
+ "PaymentRecordAmount": "Amount",
+ "PaymentRecordSceneInfo": "SceneInfo",
+ "PaymentRecordPromotionDetail": "PromotionDetail"
  }
 }