Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Common/Pay/WeChatPat/PayParam.cs

@@ -30,7 +30,7 @@ namespace Mall.Common.Pay.WeChatPat
         /// <summary>
         /// 退款金额
         /// </summary>
-        public int? RefundFee { get; set; }
+        public decimal? RefundFee { get; set; }
 
         /// <summary>
         /// 过期时间，格式（20141010121314）

Mall.WebApi/App_Code/PayUtil.cs

@@ -300,7 +300,7 @@ namespace Mall.WebApi.App_Code
         /// <param name="CustomerId"></param>
         /// <param name="openid"></param>
         /// <returns></returns>
-        private static string GetTransfersOrder(string sOrderNo, string sProductName, decimal dPrice, string CustomerId, string openid, RB_MiniProgram_Extend model, IHttpContextAccessor _accessor)
+        private static string GetTransfersOrder(string sOrderNo,  decimal dPrice, string CustomerId, string openid, RB_MiniProgram_Extend model, IHttpContextAccessor _accessor)
         {
            
             var req = new Common.Pay.WeChatPat.RequestHandler();
@@ -310,7 +310,7 @@ namespace Mall.WebApi.App_Code
             req.SetParameter("mchid", model.WeChatPayMerchants);//微信支付分配的商户号
             req.SetParameter("nonce_str", GetNoncestr());//随机字符串，不长于32位
             req.SetParameter("sign", req.CreateMd5Sign(_accessor));
-            req.SetParameter("partner_trade_no", sProductName);//商户订单号，需保持唯一性(只能是字母或者数字，不能包含有其它字符)
+            req.SetParameter("partner_trade_no", sOrderNo);//商户订单号，需保持唯一性(只能是字母或者数字，不能包含有其它字符)
             req.SetParameter("openid", openid);
             req.SetParameter("check_name", "NO_CHECK");
             req.SetParameter("amount", (dPrice * 100).ToString("f0"));