diff --git a/CoreCms.Net.Core/Config/SwaggerSetup.cs b/CoreCms.Net.Core/Config/SwaggerSetup.cs index c3edb79..1721cb5 100644 --- a/CoreCms.Net.Core/Config/SwaggerSetup.cs +++ b/CoreCms.Net.Core/Config/SwaggerSetup.cs @@ -28,7 +28,7 @@ namespace CoreCms.Net.Core.Config public static void AddAdminSwaggerSetup(this IServiceCollection services) { if (services == null) throw new ArgumentNullException(nameof(services)); - var apiName = "核心商城系统管理端"; + var apiName = "山雀棋牌管理端"; services.AddSwaggerGen((s) => { @@ -80,7 +80,7 @@ namespace CoreCms.Net.Core.Config public static void AddClientSwaggerSetup(this IServiceCollection services) { if (services == null) throw new ArgumentNullException(nameof(services)); - var apiName = "核心商城系统接口端"; + var apiName = "山雀棋牌接口端"; services.AddSwaggerGen((s) => { diff --git a/CoreCms.Net.Services/Pay/WeChatPayServices.cs b/CoreCms.Net.Services/Pay/WeChatPayServices.cs index 9e13d7a..b777c6d 100644 --- a/CoreCms.Net.Services/Pay/WeChatPayServices.cs +++ b/CoreCms.Net.Services/Pay/WeChatPayServices.cs @@ -116,7 +116,7 @@ namespace CoreCms.Net.Services NotifyUrl = weChatPayUrl, TradeType = tradeType, OpenId = openId, - TimeExpire= DateTime.Now.AddMinutes(5).ToString("yyyyMMddHHmmss") + TimeExpire = DateTime.Now.AddMinutes(5).ToString("yyyyMMddHHmmss") }; var response = await _client.ExecuteAsync(request, _optionsAccessor.Value); @@ -183,7 +183,7 @@ namespace CoreCms.Net.Services else { jm.status = false; - jm.msg = "退款失败"; + jm.msg = "退款失败" + response.ErrCodeDes; jm.data = response; } diff --git a/CoreCms.Net.Task/SQReservationRefundJob.cs b/CoreCms.Net.Task/SQReservationRefundJob.cs index d9e0f62..3de6cc0 100644 --- a/CoreCms.Net.Task/SQReservationRefundJob.cs +++ b/CoreCms.Net.Task/SQReservationRefundJob.cs @@ -101,7 +101,7 @@ public class SQReservationRefundJob } else { - await _participantsServices.UpdateAsync(it => new SQReservationParticipants { is_refund = 9, remarks = $"发起退款失败！" + refundInfo.refundId }, it => it.id == participant.id); + await _participantsServices.UpdateAsync(it => new SQReservationParticipants { is_refund = 9, remarks = $"发起退款失败！{refundInfo.refundId},{doRefundRes.msg}" }, it => it.id == participant.id); } } catch (Exception ex) diff --git a/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js b/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js index 8665f50..5b02385 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js +++ b/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js @@ -11,9 +11,9 @@ layui.define(['laytpl', 'layer', 'element', 'util'], function (exports) { , engine: '.html' //视图文件后缀名 , pageTabs: false //是否开启页面选项卡功能。单页版不推荐开启 - , name: '核心商城系统' - , version: 'CoreShop v1.5.5' - , tableName: 'CoreCms' //本地存储表名 + , name: '山雀棋牌' + , version: 'sqqp v1.0.0' + , tableName: 'sqqp' //本地存储表名 , MOD_NAME: 'admin' //模块事件名 , debug: true //是否开启调试模式。如开启，接口异常时会抛出异常 URL 等信息 diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/layout.html b/CoreCms.Net.Web.Admin/wwwroot/views/layout.html index 33e9235..13bdf6f 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/layout.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/layout.html @@ -63,8 +63,8 @@ lay-done="layui.element.render('nav', 'layadmin-system-side-menu');layui.data.updateMainBreadcrumb();" id="TPL_layout">