From 4ddeae8687ecfaae484a8a6ce62042ea8e2d9191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E9=95=87=E6=B1=90?= <8907060@qq.com>
Date: Mon, 16 Jul 2018 09:01:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=BE=AE=E4=BF=A1=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E5=9B=9E=E8=B0=83=E6=9C=8D=E5=8A=A1=E7=9A=84=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=8F=82=E6=95=B0=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/version.props                           |  2 +-
 .../Services/WechatpayNotifyService.cs        | 22 +++++++++----------
 src/Util/Helpers/Convert.cs                   |  8 +++----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/build/version.props b/build/version.props
index 42ee8495..3ecd1ad8 100644
--- a/build/version.props
+++ b/build/version.props
@@ -3,7 +3,7 @@
 		<VersionMajor>1</VersionMajor>
 		<VersionMinor>0</VersionMinor>
 		<VersionPatch>11</VersionPatch>
-		<VersionQuality>20180716-1</VersionQuality>
+		<VersionQuality>20180716-2</VersionQuality>
 		<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
 		<VersionSuffix>preview-$(VersionQuality)</VersionSuffix>
 	</PropertyGroup>
diff --git a/src/Util.Biz.Payments/Wechatpay/Services/WechatpayNotifyService.cs b/src/Util.Biz.Payments/Wechatpay/Services/WechatpayNotifyService.cs
index 3f422fca..ff51315c 100644
--- a/src/Util.Biz.Payments/Wechatpay/Services/WechatpayNotifyService.cs
+++ b/src/Util.Biz.Payments/Wechatpay/Services/WechatpayNotifyService.cs
@@ -35,6 +35,14 @@ namespace Util.Biz.Payments.Wechatpay.Services {
             _isLoad = false;
         }
 
+        /// <summary>
+        /// 获取参数集合
+        /// </summary>
+        public IDictionary<string, string> GetParams() {
+            Init();
+            return _result.GetParams();
+        }
+
         /// <summary>
         /// 获取参数
         /// </summary>
@@ -78,14 +86,6 @@ namespace Util.Biz.Payments.Wechatpay.Services {
             }
         }
 
-        /// <summary>
-        /// 获取参数集合
-        /// </summary>
-        public IDictionary<string, string> GetParams() {
-            Init();
-            return _result.GetParams();
-        }
-
         /// <summary>
         /// 验证
         /// </summary>
@@ -121,16 +121,16 @@ namespace Util.Biz.Payments.Wechatpay.Services {
         /// <summary>
         /// 商户订单号
         /// </summary>
-        public string OrderId => _result.GetParam( WechatpayConst.OutTradeNo );
+        public string OrderId => GetParam( WechatpayConst.OutTradeNo );
 
         /// <summary>
         /// 支付订单号
         /// </summary>
-        public string TradeNo => _result.GetParam( WechatpayConst.TransactionId );
+        public string TradeNo => GetParam( WechatpayConst.TransactionId );
 
         /// <summary>
         /// 支付金额
         /// </summary>
-        public decimal Money => Convert.ToDecimal( _result.GetParam( WechatpayConst.TotalFee ).ToInt() / 100, 2 );
+        public decimal Money => Convert.ToDecimal( GetParam( WechatpayConst.TotalFee ).ToInt() / 100, 2 );
     }
 }
diff --git a/src/Util/Helpers/Convert.cs b/src/Util/Helpers/Convert.cs
index a462a842..f988111f 100644
--- a/src/Util/Helpers/Convert.cs
+++ b/src/Util/Helpers/Convert.cs
@@ -86,7 +86,7 @@ namespace Util.Helpers {
         }
 
         /// <summary>
-        /// 转换为64位浮点型,并按指定小数位舍入，温馨提示：4舍6入5成双
+        /// 转换为64位浮点型,并按指定小数位舍入
         /// </summary>
         /// <param name="input">输入值</param>
         /// <param name="digits">小数位数</param>
@@ -95,7 +95,7 @@ namespace Util.Helpers {
         }
 
         /// <summary>
-        /// 转换为64位可空浮点型,并按指定小数位舍入，温馨提示：4舍6入5成双
+        /// 转换为64位可空浮点型,并按指定小数位舍入
         /// </summary>
         /// <param name="input">输入值</param>
         /// <param name="digits">小数位数</param>
@@ -109,7 +109,7 @@ namespace Util.Helpers {
         }
 
         /// <summary>
-        /// 转换为128位浮点型,并按指定小数位舍入，温馨提示：4舍6入5成双
+        /// 转换为128位浮点型,并按指定小数位舍入
         /// </summary>
         /// <param name="input">输入值</param>
         /// <param name="digits">小数位数</param>
@@ -118,7 +118,7 @@ namespace Util.Helpers {
         }
 
         /// <summary>
-        /// 转换为128位可空浮点型,并按指定小数位舍入，温馨提示：4舍6入5成双
+        /// 转换为128位可空浮点型,并按指定小数位舍入
         /// </summary>
         /// <param name="input">输入值</param>
         /// <param name="digits">小数位数</param>