【新增】完善【退款单】的支付宝退款功能。

CoreCms.Net.IServices/Pay/IAliPayServices.cs

@@ -25,5 +25,16 @@ namespace CoreCms.Net.IServices
         /// <param name="entity">实体数据</param>
         /// <returns></returns>
         Task<WebApiCallBack> PubPay(CoreCmsBillPayments entity);
+
+
+        /// <summary>
+        ///     用户退款
+        /// </summary>
+        /// <param name="refundInfo">退款单数据</param>
+        /// <param name="paymentInfo">支付单数据</param>
+        /// <returns></returns>
+        Task<WebApiCallBack> Refund(CoreCmsBillRefund refundInfo, CoreCmsBillPayments paymentInfo);
+
+
     }
 }

CoreCms.Net.Services/Bill/CoreCmsBillRefundServices.cs

@@ -229,8 +229,7 @@ namespace CoreCms.Net.Services
             //支付宝退款
             else if (panyMentsInfo.paymentCode == GlobalEnumVars.PaymentsTypes.alipay.ToString())
             {
-                jm.status = false;
+                jm = await _aliPayServices.Refund(info, panyMentsInfo);
-                jm.msg = "支付宝退款未开通";
             }
             //余额退款
             else if (panyMentsInfo.paymentCode == GlobalEnumVars.PaymentsTypes.balancepay.ToString())

CoreCms.Net.Services/Pay/AliPayServices.cs

@@ -28,6 +28,8 @@ using Essensoft.Paylink.WeChatPay;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json.Linq;
 using static Aliyun.OSS.Model.LiveChannelStat;
+using Essensoft.Paylink.WeChatPay.V2.Request;
+using Essensoft.Paylink.WeChatPay.V2;
 
 namespace CoreCms.Net.Services
 {
@@ -72,8 +74,7 @@ namespace CoreCms.Net.Services
 
 
 
-            var config = await _alipayConfigServices.QueryByClauseAsync(p =>
+            var config = await _alipayConfigServices.QueryByClauseAsync(p => p.isDefault == true && p.isEnable == true && p.appType == tradeType);
-                p.isDefault == true && p.isEnable == true && p.appType == tradeType);
             if (config == null)
             {
                 jm.msg = "支付配置信息获取失败";
@@ -219,5 +220,75 @@ namespace CoreCms.Net.Services
 
 
 
+        /// <summary>
+        ///     用户退款
+        /// </summary>
+        /// <param name="refundInfo">退款单数据</param>
+        /// <param name="paymentInfo">支付单数据</param>
+        /// <returns></returns>
+        public async Task<WebApiCallBack> Refund(CoreCmsBillRefund refundInfo, CoreCmsBillPayments paymentInfo)
+        {
+            var jm = new WebApiCallBack();
+
+            var tradeType = GlobalEnumVars.WeiChatPayTradeType.JSAPI.ToString();
+            if (!string.IsNullOrEmpty(paymentInfo.parameters))
+            {
+                var jObj = (JObject)JsonConvert.DeserializeObject(paymentInfo.parameters);
+                if (jObj != null && jObj.TryGetValue("trade_type", out var value))
+                    tradeType = PayHelper.GetWeiChatPayTradeType(value.ObjectToString());
+            }
+
+            var config = await _alipayConfigServices.QueryByClauseAsync(p => p.isDefault == true && p.isEnable == true && p.appType == tradeType);
+            if (config == null)
+            {
+                jm.msg = "支付配置信息获取失败";
+                return jm;
+            }
+
+            if (string.IsNullOrEmpty(config.refundUrl))
+            {
+                jm.msg = "未获取到配置的退款通知地址";
+                return jm;
+            }
+
+            //构建linkPay请求配置实体
+            var payOptions = new AlipayOptions
+            {
+                AppId = config.appId,
+                AlipayPublicKey = config.publicKey,
+                AppPrivateKey = config.privateKey,
+                ServerUrl = config.serverUrl,
+                SignType = config.signType,
+                AppPublicCert = config.appPublicCert,
+                AlipayPublicCert = config.alipayPublicCert,
+                AlipayRootCert = config.alipayRootCert
+            };
+
+
+            var model = new AlipayTradeRefundModel
+            {
+                OutTradeNo = paymentInfo.paymentId,
+                TradeNo = paymentInfo.tradeNo,
+                RefundAmount = refundInfo.money.ToString(CultureInfo.InvariantCulture),
+                OutRequestNo = refundInfo.refundId,
+                RefundReason = "用户申请退款",
+            };
+
+
+            var req = new AlipayTradeRefundRequest();
+            req.SetBizModel(model);
+
+            var response = await _client.ExecuteAsync(req, payOptions);
+
+            jm.msg = !response.IsError ? "退款成功" : "退款失败";
+            jm.status = !response.IsError;
+            jm.data = response;
+
+
+            return jm;
+        }
+
+
+
     }
 }

CoreCms.Net.Web.Admin/wwwroot/views/financial/billrefund/audit.html

@@ -1,5 +1,12 @@
 <script type="text/html" template lay-done="layui.data.sendParams(d);">
     <div class="layui-form coreshop-form" lay-filter="LAY-app-CoreCmsBillRefund-editForm" id="LAY-app-CoreCmsBillRefund-editForm">
+        
+        <blockquote class="layui-elem-quote">
+            <p>1、什么方式支付的，就选什么支付退回</p>
+            <p>2、微信支付的不能退还到支付宝通道</p>
+            <p>3、支付宝支付的订单不能退还到微信通道</p>
+        </blockquote>
+
         <input type="hidden" name="refundId" value="{{d.params.data.model.refundId || '' }}" />
         <div class="layui-form-item">
             <label for="refundId" class="layui-form-label ">退款单ID</label>
@@ -19,7 +26,7 @@
             </div>
             <label for="money" class="layui-form-label ">状态</label>
             <div class="layui-form-mid layui-word-aux  layui-inline-3">
-                {{d.params.data.refundStatus}}
+                {{-d.params.data.refundStatus}}
             </div>
         </div>
 

CoreCms.Net.Web.Admin/wwwroot/views/financial/billrefund/index.html

@@ -259,7 +259,7 @@
                             admin.popup({
                                 shadeClose: false,
                                 title: '审核退款单',
-                                area: ['630px', '350px'],
+                                area: ['630px', '450px'],
                                 id: 'LAY-popup-CoreCmsBillRefund-edit',
                                 success: function (layero, index) {
                                     view(this.id).render('financial/billrefund/audit', { data: e.data }).done(function () {