Merge branch 'mch-transfer' into 'master'

完善商家转账功能

See merge request jianweie/coreshoppro!121

CoreCms.Net.Configuration/GlobalEnumVars.cs

@@ -351,7 +351,9 @@ namespace CoreCms.Net.Configuration
             [Description("企业付款到银行卡")]
             企业付款到银行卡 = 2,
             [Description("商家转账到零钱")]
-            商家转账到零钱 = 3
+            商家转账到零钱 = 3,
+            [Description("商家转账")]
+            商家转账 = 4
         }
 
         #endregion
@@ -3406,6 +3408,47 @@ namespace CoreCms.Net.Configuration
 
         #endregion
 
+        #region 微信在线客服
+
+        /// <summary>
+        /// 抽奖活动类型
+        /// </summary>
+        public enum WeChatAutoReplyMatchModel
+        {
+            /// <summary>
+            /// 完全等于
+            /// </summary>
+            [Description("完全等于")]
+            Complete = 1,
+
+            /// <summary>
+            /// 模糊包含
+            /// </summary>
+            [Description("模糊包含")]
+            FuzzyMatching = 2,
+        }
+
+        #endregion
+
+        #region 微信支付相关
+
+        /// <summary>
+        /// 微信支付验证微信支付身份方式
+        /// </summary>
+        public enum WeChatPayIdentityVerificationMethods
+        {
+            /// <summary>
+            /// 平台证书
+            /// </summary>
+            [Description("平台证书")]
+            PlatformCertificate = 0,
+            /// <summary>
+            /// 微信支付公钥
+            /// </summary>
+            [Description("微信支付公钥")]
+            PlatformPublicKey = 1,
+        }
+        #endregion
 
     }
 }

CoreCms.Net.IRepository/Pay/ICoreCmsWeChatPayPlatformCertificateRepository.cs

@@ -0,0 +1,91 @@
+/***********************************************************************
+ *            Project: CoreCms
+ *        ProjectName: 核心内容管理系统
+ *                Web: https://www.corecms.net
+ *             Author: 大灰灰
+ *              Email: jianweie@163.com
+ *         CreateTime: 2025/7/21 20:36:56
+ *        Description: 暂无
+ ***********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using CoreCms.Net.Model.Entities;
+using CoreCms.Net.Model.ViewModels.Basics;
+using CoreCms.Net.Model.ViewModels.UI;
+using SqlSugar;
+
+namespace CoreCms.Net.IRepository
+{
+    /// <summary>
+    /// 微信支付平台证书 工厂接口
+    /// </summary>
+    public interface ICoreCmsWeChatPayPlatformCertificateRepository : IBaseRepository<CoreCmsWeChatPayPlatformCertificate>
+    {
+        #region 重写增删改查操作===========================================================
+
+        /// <summary>
+        /// 重写异步插入方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> InsertAsync(CoreCmsWeChatPayPlatformCertificate entity);
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsWeChatPayPlatformCertificate entity);
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> UpdateAsync(List<CoreCmsWeChatPayPlatformCertificate> entity);
+
+        /// <summary>
+        /// 重写删除指定ID的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> DeleteByIdAsync(object id);
+
+        /// <summary>
+        /// 重写删除指定ID集合的数据(批量删除)
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
+
+        #endregion 重写增删改查操作===========================================================
+
+        #region 获取缓存的所有数据==========================================================
+
+        /// <summary>
+        /// 获取缓存的所有数据
+        /// </summary>
+        /// <returns></returns>
+        Task<List<CoreCmsWeChatPayPlatformCertificate>> GetCaChe();
+
+        #endregion 获取缓存的所有数据==========================================================
+
+        /// <summary>
+        ///     重写根据条件查询分页数据
+        /// </summary>
+        /// <param name="predicate">判断集合</param>
+        /// <param name="orderByType">排序方式</param>
+        /// <param name="pageIndex">当前页面索引</param>
+        /// <param name="pageSize">分布大小</param>
+        /// <param name="orderByExpression"></param>
+        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
+        /// <returns></returns>
+        Task<IPageList<CoreCmsWeChatPayPlatformCertificate>> QueryPageAsync(
+            Expression<Func<CoreCmsWeChatPayPlatformCertificate, bool>> predicate,
+            Expression<Func<CoreCmsWeChatPayPlatformCertificate, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
+            int pageSize = 20, bool blUseNoLock = false);
+    }
+}

CoreCms.Net.IRepository/User/ICoreCmsUserTocashWeChatNotifyRepository.cs

@@ -0,0 +1,89 @@
+/***********************************************************************
+ *            Project: CoreCms
+ *        ProjectName: 核心内容管理系统
+ *                Web: https://www.corecms.net
+ *             Author: 大灰灰
+ *              Email: jianweie@163.com
+ *         CreateTime: 2025/7/28 23:08:04
+ *        Description: 暂无
+ ***********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using CoreCms.Net.Model.Entities;
+using CoreCms.Net.Model.ViewModels.Basics;
+using CoreCms.Net.Model.ViewModels.UI;
+using SqlSugar;
+
+namespace CoreCms.Net.IRepository
+{
+    /// <summary>
+    /// 用户提现使用商家转账微信回调通知 工厂接口
+    /// </summary>
+    public interface ICoreCmsUserTocashWeChatNotifyRepository : IBaseRepository<CoreCmsUserTocashWeChatNotify>
+    {
+        #region 重写增删改查操作===========================================================
+
+        /// <summary>
+        /// 重写异步插入方法（返回序列）
+        /// </summary>
+        /// <param name="entity">实体数据</param>
+        /// <returns></returns>
+        Task<int> ExecuteReturnIdentityAsync(CoreCmsUserTocashWeChatNotify entity);
+
+
+        /// <summary>
+        /// 重写异步插入方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> InsertAsync(CoreCmsUserTocashWeChatNotify entity);
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsUserTocashWeChatNotify entity);
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> UpdateAsync(List<CoreCmsUserTocashWeChatNotify> entity);
+
+        /// <summary>
+        /// 重写删除指定ID的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> DeleteByIdAsync(object id);
+
+        /// <summary>
+        /// 重写删除指定ID集合的数据(批量删除)
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
+
+        #endregion 重写增删改查操作===========================================================
+
+        /// <summary>
+        ///     重写根据条件查询分页数据
+        /// </summary>
+        /// <param name="predicate">判断集合</param>
+        /// <param name="orderByType">排序方式</param>
+        /// <param name="pageIndex">当前页面索引</param>
+        /// <param name="pageSize">分布大小</param>
+        /// <param name="orderByExpression"></param>
+        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
+        /// <returns></returns>
+        Task<IPageList<CoreCmsUserTocashWeChatNotify>> QueryPageAsync(
+            Expression<Func<CoreCmsUserTocashWeChatNotify, bool>> predicate,
+            Expression<Func<CoreCmsUserTocashWeChatNotify, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
+            int pageSize = 20, bool blUseNoLock = false);
+    }
+}

CoreCms.Net.IRepository/User/ICoreCmsUserTocashWeChatResponseRepository.cs

@@ -0,0 +1,81 @@
+/***********************************************************************
+ *            Project: CoreCms
+ *        ProjectName: 核心内容管理系统
+ *                Web: https://www.corecms.net
+ *             Author: 大灰灰
+ *              Email: jianweie@163.com
+ *         CreateTime: 2025/7/23 16:37:18
+ *        Description: 暂无
+ ***********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using CoreCms.Net.Model.Entities;
+using CoreCms.Net.Model.ViewModels.Basics;
+using CoreCms.Net.Model.ViewModels.UI;
+using SqlSugar;
+
+namespace CoreCms.Net.IRepository
+{
+    /// <summary>
+    /// 用户提现使用商家转账回调记录 工厂接口
+    /// </summary>
+    public interface ICoreCmsUserTocashWeChatResponseRepository : IBaseRepository<CoreCmsUserTocashWeChatResponse>
+    {
+        #region 重写增删改查操作===========================================================
+
+        /// <summary>
+        /// 重写异步插入方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> InsertAsync(CoreCmsUserTocashWeChatResponse entity);
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsUserTocashWeChatResponse entity);
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> UpdateAsync(List<CoreCmsUserTocashWeChatResponse> entity);
+
+        /// <summary>
+        /// 重写删除指定ID的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> DeleteByIdAsync(object id);
+
+        /// <summary>
+        /// 重写删除指定ID集合的数据(批量删除)
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
+
+        #endregion 重写增删改查操作===========================================================
+
+        /// <summary>
+        ///     重写根据条件查询分页数据
+        /// </summary>
+        /// <param name="predicate">判断集合</param>
+        /// <param name="orderByType">排序方式</param>
+        /// <param name="pageIndex">当前页面索引</param>
+        /// <param name="pageSize">分布大小</param>
+        /// <param name="orderByExpression"></param>
+        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
+        /// <returns></returns>
+        Task<IPageList<CoreCmsUserTocashWeChatResponse>> QueryPageAsync(
+            Expression<Func<CoreCmsUserTocashWeChatResponse, bool>> predicate,
+            Expression<Func<CoreCmsUserTocashWeChatResponse, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
+            int pageSize = 20, bool blUseNoLock = false);
+    }
+}

CoreCms.Net.IServices/CoreCms.Net.IServices.csproj

@@ -7,6 +7,7 @@
   <ItemGroup>
     <PackageReference Include="AlipaySDKNet.Standard" Version="4.9.320" />
     <PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.9" />
+    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.13.0" />
   </ItemGroup>
 
   <ItemGroup>

CoreCms.Net.IServices/Pay/ICoreCmsWeChatPayPlatformCertificateServices.cs

@@ -0,0 +1,95 @@
+/***********************************************************************
+ *            Project: CoreCms
+ *        ProjectName: 核心内容管理系统
+ *                Web: https://www.corecms.net
+ *             Author: 大灰灰
+ *              Email: jianweie@163.com
+ *         CreateTime: 2025/7/21 20:36:56
+ *        Description: 暂无
+ ***********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using CoreCms.Net.Model.Entities;
+using CoreCms.Net.Model.ViewModels.Basics;
+using CoreCms.Net.Model.ViewModels.UI;
+using SqlSugar;
+
+namespace CoreCms.Net.IServices
+{
+    /// <summary>
+    /// 微信支付平台证书 服务工厂接口
+    /// </summary>
+    public interface ICoreCmsWeChatPayPlatformCertificateServices : IBaseServices<CoreCmsWeChatPayPlatformCertificate>
+    {
+        #region 重写增删改查操作===========================================================
+
+        /// <summary>
+        /// 重写异步插入方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> InsertAsync(CoreCmsWeChatPayPlatformCertificate entity);
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsWeChatPayPlatformCertificate entity);
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> UpdateAsync(List<CoreCmsWeChatPayPlatformCertificate> entity);
+
+        /// <summary>
+        /// 重写删除指定ID的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> DeleteByIdAsync(object id);
+
+        /// <summary>
+        /// 重写删除指定ID集合的数据(批量删除)
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
+
+        #endregion 重写增删改查操作===========================================================
+
+        #region 获取缓存的所有数据==========================================================
+
+        /// <summary>
+        /// 获取缓存的所有数据
+        /// </summary>
+        /// <returns></returns>
+        Task<List<CoreCmsWeChatPayPlatformCertificate>> GetCaChe();
+
+        #endregion 获取缓存的所有数据==========================================================
+
+        #region 重写根据条件查询分页数据
+
+        /// <summary>
+        ///     重写根据条件查询分页数据
+        /// </summary>
+        /// <param name="predicate">判断集合</param>
+        /// <param name="orderByType">排序方式</param>
+        /// <param name="pageIndex">当前页面索引</param>
+        /// <param name="pageSize">分布大小</param>
+        /// <param name="orderByExpression"></param>
+        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
+        /// <returns></returns>
+        Task<IPageList<CoreCmsWeChatPayPlatformCertificate>> QueryPageAsync(
+            Expression<Func<CoreCmsWeChatPayPlatformCertificate, bool>> predicate,
+            Expression<Func<CoreCmsWeChatPayPlatformCertificate, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
+            int pageSize = 20, bool blUseNoLock = false);
+
+        #endregion 重写根据条件查询分页数据
+    }
+}

CoreCms.Net.IServices/User/ICoreCmsUserTocashWeChatNotifyServices.cs

@@ -0,0 +1,90 @@
+/***********************************************************************
+ *            Project: CoreCms
+ *        ProjectName: 核心内容管理系统                                
+ *                Web: https://www.corecms.net                      
+ *             Author: 大灰灰                                          
+ *              Email: jianweie@163.com                                
+ *         CreateTime: 2025/7/28 23:08:04
+ *        Description: 暂无
+ ***********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using CoreCms.Net.Model.Entities;
+using CoreCms.Net.Model.ViewModels.Basics;
+using CoreCms.Net.Model.ViewModels.UI;
+using SqlSugar;
+
+namespace CoreCms.Net.IServices
+{
+    /// <summary>
+    /// 用户提现使用商家转账微信回调通知 服务工厂接口
+    /// </summary>
+    public interface ICoreCmsUserTocashWeChatNotifyServices : IBaseServices<CoreCmsUserTocashWeChatNotify>
+    {
+        #region 重写增删改查操作===========================================================
+
+        /// <summary>
+        /// 重写异步插入方法（返回序列）
+        /// </summary>
+        /// <param name="entity">实体数据</param>
+        /// <returns></returns>
+        Task<int> ExecuteReturnIdentityAsync(CoreCmsUserTocashWeChatNotify entity);
+
+        /// <summary>
+        /// 重写异步插入方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> InsertAsync(CoreCmsUserTocashWeChatNotify entity);
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsUserTocashWeChatNotify entity);
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> UpdateAsync(List<CoreCmsUserTocashWeChatNotify> entity);
+
+        /// <summary>
+        /// 重写删除指定ID的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> DeleteByIdAsync(object id);
+
+        /// <summary>
+        /// 重写删除指定ID集合的数据(批量删除)
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
+
+        #endregion
+
+        #region 重写根据条件查询分页数据
+        /// <summary>
+        ///     重写根据条件查询分页数据
+        /// </summary>
+        /// <param name="predicate">判断集合</param>
+        /// <param name="orderByType">排序方式</param>
+        /// <param name="pageIndex">当前页面索引</param>
+        /// <param name="pageSize">分布大小</param>
+        /// <param name="orderByExpression"></param>
+        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
+        /// <returns></returns>
+        Task<IPageList<CoreCmsUserTocashWeChatNotify>> QueryPageAsync(
+            Expression<Func<CoreCmsUserTocashWeChatNotify, bool>> predicate,
+            Expression<Func<CoreCmsUserTocashWeChatNotify, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
+            int pageSize = 20, bool blUseNoLock = false);
+        #endregion
+    }
+}

CoreCms.Net.IServices/User/ICoreCmsUserTocashWeChatResponseServices.cs

@@ -0,0 +1,85 @@
+/***********************************************************************
+ *            Project: CoreCms
+ *        ProjectName: 核心内容管理系统
+ *                Web: https://www.corecms.net
+ *             Author: 大灰灰
+ *              Email: jianweie@163.com
+ *         CreateTime: 2025/7/23 16:37:18
+ *        Description: 暂无
+ ***********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using CoreCms.Net.Model.Entities;
+using CoreCms.Net.Model.ViewModels.Basics;
+using CoreCms.Net.Model.ViewModels.UI;
+using SqlSugar;
+
+namespace CoreCms.Net.IServices
+{
+    /// <summary>
+    /// 用户提现使用商家转账回调记录 服务工厂接口
+    /// </summary>
+    public interface ICoreCmsUserTocashWeChatResponseServices : IBaseServices<CoreCmsUserTocashWeChatResponse>
+    {
+        #region 重写增删改查操作===========================================================
+
+        /// <summary>
+        /// 重写异步插入方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> InsertAsync(CoreCmsUserTocashWeChatResponse entity);
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> UpdateAsync(CoreCmsUserTocashWeChatResponse entity);
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> UpdateAsync(List<CoreCmsUserTocashWeChatResponse> entity);
+
+        /// <summary>
+        /// 重写删除指定ID的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> DeleteByIdAsync(object id);
+
+        /// <summary>
+        /// 重写删除指定ID集合的数据(批量删除)
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids);
+
+        #endregion 重写增删改查操作===========================================================
+
+        #region 重写根据条件查询分页数据
+
+        /// <summary>
+        ///     重写根据条件查询分页数据
+        /// </summary>
+        /// <param name="predicate">判断集合</param>
+        /// <param name="orderByType">排序方式</param>
+        /// <param name="pageIndex">当前页面索引</param>
+        /// <param name="pageSize">分布大小</param>
+        /// <param name="orderByExpression"></param>
+        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
+        /// <returns></returns>
+        Task<IPageList<CoreCmsUserTocashWeChatResponse>> QueryPageAsync(
+            Expression<Func<CoreCmsUserTocashWeChatResponse, bool>> predicate,
+            Expression<Func<CoreCmsUserTocashWeChatResponse, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
+            int pageSize = 20, bool blUseNoLock = false);
+
+        #endregion 重写根据条件查询分页数据
+    }
+}

CoreCms.Net.IServices/WechatTenpay/IWechatTenpayClientFactory.cs

@@ -0,0 +1,13 @@
+using System.Threading.Tasks;
+using SKIT.FlurlHttpClient.Wechat.TenpayV3;
+
+namespace CoreCms.Net.IServices
+{
+    /// <summary>
+    /// ΢<><CEA2>֧<EFBFBD><D6A7><EFBFBD><EFBFBD><EFBFBD>ӹ<EFBFBD><D3B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӿ<EFBFBD>
+    /// </summary>
+    public interface IWechatTenpayClientFactory
+    {
+        Task<WechatTenpayClient> Create(string merchantId);
+    }
+}

CoreCms.Net.Model/CoreCms.Net.Model.xml

@@ -4743,7 +4743,7 @@
         </member>
         <member name="T:CoreCms.Net.Model.Entities.CoreCmsWeChatPayConfig">
             <summary>
-            微信支付配置
+            微信支付配置表
             </summary>
         </member>
         <member name="M:CoreCms.Net.Model.Entities.CoreCmsWeChatPayConfig.#ctor">
@@ -4826,6 +4826,96 @@
             应用类型
             </summary>
         </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsWeChatPayConfig.payType">
+            <summary>
+            高级模式
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsWeChatPayConfig.certificateSerialNumber">
+            <summary>
+            商户证书序列号
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsWeChatPayConfig.certificatePrivateKey">
+            <summary>
+            商户证书文件内容
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsWeChatPayConfig.platformSerialNumber">
+            <summary>
+            平台证书序列号
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsWeChatPayConfig.platformPublicKeyId">
+            <summary>
+            平台公钥ID
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsWeChatPayConfig.platformPublicKey">
+            <summary>
+            平台公钥内容
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsWeChatPayConfig.transferBillsUrl">
+            <summary>
+            提现回调通知
+            </summary>
+        </member>
+        <member name="T:CoreCms.Net.Model.Entities.CoreCmsWeChatPayPlatformCertificate">
+            <summary>
+            微信支付平台证书
+            </summary>
+        </member>
+        <member name="M:CoreCms.Net.Model.Entities.CoreCmsWeChatPayPlatformCertificate.#ctor">
+            <summary>
+            构造函数
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsWeChatPayPlatformCertificate.id">
+            <summary>
+            序列
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsWeChatPayPlatformCertificate.algorithmType">
+            <summary>
+            证书算法类型
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsWeChatPayPlatformCertificate.certificate">
+            <summary>
+            证书内容
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsWeChatPayPlatformCertificate.effectiveTime">
+            <summary>
+            获取生效时间
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsWeChatPayPlatformCertificate.expireTime">
+            <summary>
+            获取过期时间
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsWeChatPayPlatformCertificate.serialNumber">
+            <summary>
+            证书编号
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsWeChatPayPlatformCertificate.merchantId">
+            <summary>
+            商户编号
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsWeChatPayPlatformCertificate.createTime">
+            <summary>
+            创建时间
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsWeChatPayPlatformCertificate.updataTime">
+            <summary>
+            更新时间
+            </summary>
+        </member>
         <member name="T:CoreCms.Net.Model.Entities.CoreCmsPinTuanGoods">
             <summary>
             拼团商品表
@@ -8292,6 +8382,11 @@
             反馈结果
             </summary>
         </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsUserTocash.needUserGet">
+            <summary>
+            需要用户领取
+            </summary>
+        </member>
         <member name="P:CoreCms.Net.Model.Entities.CoreCmsUserTocash.statusName">
             <summary>
                 状态说明
@@ -8302,6 +8397,146 @@
                 用户昵称
             </summary>
         </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsUserTocash.merchantTransferData">
+            <summary>
+            商家转账反馈数据
+            </summary>
+        </member>
+        <member name="T:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatNotify">
+            <summary>
+            用户提现使用商家转账微信回调通知
+            </summary>
+        </member>
+        <member name="M:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatNotify.#ctor">
+            <summary>
+            构造函数
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatNotify.id">
+            <summary>
+            序列
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatNotify.callBackId">
+            <summary>
+            通知ID
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatNotify.create_time">
+            <summary>
+            通知创建时间
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatNotify.resource_type">
+            <summary>
+            通知数据类型
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatNotify.event_type">
+            <summary>
+            通知类型
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatNotify.summary">
+            <summary>
+            回调摘要
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatNotify.resource">
+            <summary>
+            通知数据
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatNotify.createTime">
+            <summary>
+            创建时间
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatNotify.wechatpaySerial">
+            <summary>
+            验签的平台证书序列号或支付公钥ID
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatNotify.wechatpaySignature">
+            <summary>
+            验签的签名值
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatNotify.wechatpayTimestamp">
+            <summary>
+            验签的时间戳
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatNotify.wechatpayNonce">
+            <summary>
+            验签的随机字符串
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatNotify.decryptedData">
+            <summary>
+            解密数据
+            </summary>
+        </member>
+        <member name="T:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatResponse">
+            <summary>
+            用户提现使用商家转账回调记录
+            </summary>
+        </member>
+        <member name="M:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatResponse.#ctor">
+            <summary>
+            构造函数
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatResponse.id">
+            <summary>
+            序列
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatResponse.out_bill_no">
+            <summary>
+            商户单号
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatResponse.transfer_bill_no">
+            <summary>
+            微信转账单号
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatResponse.create_time">
+            <summary>
+            单据创建时间
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatResponse.state">
+            <summary>
+            单据状态
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatResponse.package_info">
+            <summary>
+            跳转领取页面的package信息
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatResponse.code">
+            <summary>
+            状态码
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatResponse.message">
+            <summary>
+            消息内容
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatResponse.detail">
+            <summary>
+            描述
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.CoreCmsUserTocashWeChatResponse.createTime">
+            <summary>
+            创建时间
+            </summary>
+        </member>
         <member name="T:CoreCms.Net.Model.Entities.CoreCmsUserToken">
             <summary>
             用户token
@@ -10094,6 +10329,72 @@
                 base64数据
             </summary>
         </member>
+        <member name="T:CoreCms.Net.Model.FromBody.FMTransferBillsCallBack">
+            <summary>
+            商家转账回调通知实体数据
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.FromBody.FMTransferBillsCallBack.id">
+            <summary>
+            通知ID】通知的唯一ID
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.FromBody.FMTransferBillsCallBack.create_time">
+            <summary>
+            【通知创建时间】
+            通知创建的时间，遵循rfc3339标准格式，格式为yyyy-MM-DDTHH:mm:ss+TIMEZONE，yyyy-MM-DD表示年月日，T出现在字符串中，表示time元素的开头，HH:mm:ss.表示时分秒，TIMEZONE表示时区（+08:00表示东八区时间，领先UTC 8小时，即北京时间）。例如：2015-05-20T13:29:35+08:00表示北京时间2015年05月20日13点29分35秒。
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.FromBody.FMTransferBillsCallBack.resource_type">
+            <summary>
+            【通知数据类型】通知的资源数据类型，商家转账通知为encrypt-resource
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.FromBody.FMTransferBillsCallBack.event_type">
+            <summary>
+            【通知类型】通知的类型，商家转账通知的类型为MCHTRANSFER.BILL.FINISHED
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.FromBody.FMTransferBillsCallBack.summary">
+            <summary>
+            【回调摘要】回调摘要
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.FromBody.FMTransferBillsCallBack.resource">
+            <summary>
+            通知数据
+            </summary>
+        </member>
+        <member name="T:CoreCms.Net.Model.FromBody.FMTransferBillsCallBackResource">
+            <summary>
+            商家转账回调通知实体数据-通知数据
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.FromBody.FMTransferBillsCallBackResource.original_type">
+            <summary>
+            【原始类型】原始回调类型，为mch_payment
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.FromBody.FMTransferBillsCallBackResource.algorithm">
+            <summary>
+            【加密算法类型】对开启结果数据进行加密的加密算法，目前只支持AEAD_AES_256_GCM
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.FromBody.FMTransferBillsCallBackResource.ciphertext">
+            <summary>
+            数据密文】Base64编码后的商家转账结果数据密文
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.FromBody.FMTransferBillsCallBackResource.associated_data">
+            <summary>
+            【附加数据】附加数据
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.FromBody.FMTransferBillsCallBackResource.nonce">
+            <summary>
+            随机串】加密使用的随机串。
+            </summary>
+        </member>
         <member name="T:CoreCms.Net.Model.FromBody.FMUpdateBoolDataByIntId">
             <summary>
                 按照序列进行更新Bool类型数据

CoreCms.Net.Model/Entities/Pay/CoreCmsWeChatPayConfig.cs

@@ -4,7 +4,7 @@
  *                Web: https://www.corecms.net
  *             Author: 大灰灰
  *              Email: jianweie@163.com
- *         CreateTime: 2023/4/22 23:40:15
+ *         CreateTime: 2025/7/28 22:49:53
  *        Description: 暂无
  ***********************************************************************/
 
@@ -15,7 +15,7 @@ using System.ComponentModel.DataAnnotations;
 namespace CoreCms.Net.Model.Entities
 {
     /// <summary>
-    /// 微信支付配置
+    /// 微信支付配置表
     /// </summary>
     public partial class CoreCmsWeChatPayConfig
     {
@@ -30,183 +30,168 @@ namespace CoreCms.Net.Model.Entities
         /// 序列
         /// </summary>
         [Display(Name = "序列")]
-		
         [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
-        
         [Required(ErrorMessage = "请输入{0}")]
-        
+        public System.Int32 id { get; set; }
-        
-        
-        public System.Int32 id  { get; set; }
-        
 
         /// <summary>
         /// 应用号
         /// </summary>
         [Display(Name = "应用号")]
-		
         [Required(ErrorMessage = "请输入{0}")]
-        
+        [StringLength(maximumLength: 50, ErrorMessage = "{0}不能超过{1}字")]
-        [StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")]
+        public System.String appId { get; set; }
-        
-        public System.String appId  { get; set; }
-        
 
         /// <summary>
         /// 商户号
         /// </summary>
         [Display(Name = "商户号")]
-		
         [Required(ErrorMessage = "请输入{0}")]
-        
+        [StringLength(maximumLength: 50, ErrorMessage = "{0}不能超过{1}字")]
-        [StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")]
+        public System.String mchId { get; set; }
-        
-        public System.String mchId  { get; set; }
-        
 
         /// <summary>
         /// API秘钥
         /// </summary>
         [Display(Name = "API秘钥")]
-		
+        [Required(ErrorMessage = "请输入{0}")]
-        
+        [StringLength(maximumLength: 50, ErrorMessage = "{0}不能超过{1}字")]
-        
+        public System.String apiKey { get; set; }
-        [StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")]
-        
-        public System.String apiKey  { get; set; }
-        
 
         /// <summary>
         /// APIv3密钥
         /// </summary>
         [Display(Name = "APIv3密钥")]
 
-        
+        [StringLength(maximumLength: 50, ErrorMessage = "{0}不能超过{1}字")]
-        
+        public System.String apiV3Key { get; set; }
-        [StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")]
-        
-        public System.String apiV3Key  { get; set; }
-        
 
         /// <summary>
         /// p12证书base64
         /// </summary>
         [Display(Name = "p12证书base64")]
-		
+        [Required(ErrorMessage = "请输入{0}")]
-        
+        public System.String certificate { get; set; }
-        
-        [StringLength(maximumLength:8000,ErrorMessage = "{0}不能超过{1}字")]
-        
-        public System.String certificate  { get; set; }
-        
 
         /// <summary>
         /// RSA公钥
         /// </summary>
         [Display(Name = "RSA公钥")]
 
-        
+        [StringLength(maximumLength: 1000, ErrorMessage = "{0}不能超过{1}字")]
-        
+        public System.String rsaPublicKey { get; set; }
-        [StringLength(maximumLength:1000,ErrorMessage = "{0}不能超过{1}字")]
-        
-        public System.String rsaPublicKey  { get; set; }
-        
 
         /// <summary>
         /// 子商户应用号
         /// </summary>
         [Display(Name = "子商户应用号")]
 
-        
+        [StringLength(maximumLength: 50, ErrorMessage = "{0}不能超过{1}字")]
-        
+        public System.String subAppId { get; set; }
-        [StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")]
-        
-        public System.String subAppId  { get; set; }
-        
 
         /// <summary>
         /// 子商户号
         /// </summary>
         [Display(Name = "子商户号")]
 
-        
+        [StringLength(maximumLength: 50, ErrorMessage = "{0}不能超过{1}字")]
-        
+        public System.String subMchId { get; set; }
-        [StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")]
-        
-        public System.String subMchId  { get; set; }
-        
 
         /// <summary>
         /// 支付回调通知
         /// </summary>
         [Display(Name = "支付回调通知")]
-		
+        [Required(ErrorMessage = "请输入{0}")]
-        
+        [StringLength(maximumLength: 200, ErrorMessage = "{0}不能超过{1}字")]
-        
+        public System.String notifyUrl { get; set; }
-        [StringLength(maximumLength:200,ErrorMessage = "{0}不能超过{1}字")]
-        
-        public System.String notifyUrl  { get; set; }
-        
 
         /// <summary>
         /// 退款回调
         /// </summary>
         [Display(Name = "退款回调")]
-		
+        [Required(ErrorMessage = "请输入{0}")]
-        
+        [StringLength(maximumLength: 200, ErrorMessage = "{0}不能超过{1}字")]
-        
+        public System.String refundUrl { get; set; }
-        [StringLength(maximumLength:200,ErrorMessage = "{0}不能超过{1}字")]
-        
-        public System.String refundUrl  { get; set; }
-        
 
         /// <summary>
         /// 跳转地址
         /// </summary>
         [Display(Name = "跳转地址")]
 
-        
+        [StringLength(maximumLength: 200, ErrorMessage = "{0}不能超过{1}字")]
-        
+        public System.String jumpUrl { get; set; }
-        [StringLength(maximumLength:200,ErrorMessage = "{0}不能超过{1}字")]
-        
-        public System.String jumpUrl  { get; set; }
-        
 
         /// <summary>
         /// 是否开启
         /// </summary>
         [Display(Name = "是否开启")]
-		
         [Required(ErrorMessage = "请输入{0}")]
-        
+        public System.Boolean isEnable { get; set; }
-        
-        
-        public System.Boolean isEnable  { get; set; }
-        
 
         /// <summary>
         /// 是否本类默认
         /// </summary>
         [Display(Name = "是否本类默认")]
-		
         [Required(ErrorMessage = "请输入{0}")]
-        
+        public System.Boolean isDefault { get; set; }
-        
-        
-        public System.Boolean isDefault  { get; set; }
-        
 
         /// <summary>
         /// 应用类型
         /// </summary>
         [Display(Name = "应用类型")]
+        [Required(ErrorMessage = "请输入{0}")]
+        [StringLength(maximumLength: 50, ErrorMessage = "{0}不能超过{1}字")]
+        public System.String appType { get; set; }
 
+        /// <summary>
+        /// 高级模式
+        /// </summary>
+        [Display(Name = "高级模式")]
+        [Required(ErrorMessage = "请输入{0}")]
+        public System.Int32 payType { get; set; }
 
+        /// <summary>
+        /// 商户证书序列号
+        /// </summary>
+        [Display(Name = "商户证书序列号")]
 
-        [StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")]
+        [StringLength(maximumLength: 50, ErrorMessage = "{0}不能超过{1}字")]
+        public System.String certificateSerialNumber { get; set; }
 
-        public System.String appType  { get; set; }
+        /// <summary>
+        /// 商户证书文件内容
+        /// </summary>
+        [Display(Name = "商户证书文件内容")]
+        public System.String certificatePrivateKey { get; set; }
 
+        /// <summary>
+        /// 平台证书序列号
+        /// </summary>
+        [Display(Name = "平台证书序列号")]
 
+        [StringLength(maximumLength: 50, ErrorMessage = "{0}不能超过{1}字")]
+        public System.String platformSerialNumber { get; set; }
+
+        /// <summary>
+        /// 平台公钥ID
+        /// </summary>
+        [Display(Name = "平台公钥ID")]
+
+        [StringLength(maximumLength: 50, ErrorMessage = "{0}不能超过{1}字")]
+        public System.String platformPublicKeyId { get; set; }
+
+        /// <summary>
+        /// 平台公钥内容
+        /// </summary>
+        [Display(Name = "平台公钥内容")]
+        public System.String platformPublicKey { get; set; }
+
+        /// <summary>
+        /// 提现回调通知
+        /// </summary>
+        [Display(Name = "提现回调通知")]
+
+        [StringLength(maximumLength: 200, ErrorMessage = "{0}不能超过{1}字")]
+        public System.String transferBillsUrl { get; set; }
     }
 }

CoreCms.Net.Model/Entities/Pay/CoreCmsWeChatPayPlatformCertificate.cs

@@ -0,0 +1,95 @@
+/***********************************************************************
+ *            Project: CoreCms
+ *        ProjectName: 核心内容管理系统
+ *                Web: https://www.corecms.net
+ *             Author: 大灰灰
+ *              Email: jianweie@163.com
+ *         CreateTime: 2025/7/21 20:39:06
+ *        Description: 暂无
+ ***********************************************************************/
+
+using SqlSugar;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+
+namespace CoreCms.Net.Model.Entities
+{
+    /// <summary>
+    /// 微信支付平台证书
+    /// </summary>
+    public partial class CoreCmsWeChatPayPlatformCertificate
+    {
+        /// <summary>
+        /// 构造函数
+        /// </summary>
+        public CoreCmsWeChatPayPlatformCertificate()
+        {
+        }
+
+        /// <summary>
+        /// 序列
+        /// </summary>
+        [Display(Name = "序列")]
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        [Required(ErrorMessage = "请输入{0}")]
+        public System.Int32 id { get; set; }
+
+        /// <summary>
+        /// 证书算法类型
+        /// </summary>
+        [Display(Name = "证书算法类型")]
+        [Required(ErrorMessage = "请输入{0}")]
+        [StringLength(maximumLength: 50, ErrorMessage = "{0}不能超过{1}字")]
+        public System.String algorithmType { get; set; }
+
+        /// <summary>
+        /// 证书内容
+        /// </summary>
+        [Display(Name = "证书内容")]
+        [Required(ErrorMessage = "请输入{0}")]
+        public System.String certificate { get; set; }
+
+        /// <summary>
+        /// 获取生效时间
+        /// </summary>
+        [Display(Name = "获取生效时间")]
+        [Required(ErrorMessage = "请输入{0}")]
+        public System.DateTime effectiveTime { get; set; }
+
+        /// <summary>
+        /// 获取过期时间
+        /// </summary>
+        [Display(Name = "获取过期时间")]
+        [Required(ErrorMessage = "请输入{0}")]
+        public System.DateTime expireTime { get; set; }
+
+        /// <summary>
+        /// 证书编号
+        /// </summary>
+        [Display(Name = "证书编号")]
+        [Required(ErrorMessage = "请输入{0}")]
+        [StringLength(maximumLength: 50, ErrorMessage = "{0}不能超过{1}字")]
+        public System.String serialNumber { get; set; }
+
+        /// <summary>
+        /// 商户编号
+        /// </summary>
+        [Display(Name = "商户编号")]
+        [Required(ErrorMessage = "请输入{0}")]
+        [StringLength(maximumLength: 50, ErrorMessage = "{0}不能超过{1}字")]
+        public System.String merchantId { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Display(Name = "创建时间")]
+        [Required(ErrorMessage = "请输入{0}")]
+        public System.DateTime createTime { get; set; }
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        [Display(Name = "更新时间")]
+        public System.DateTime? updataTime { get; set; }
+    }
+}

CoreCms.Net.Model/Entities/User/CoreCmsUserTocash.cs

@@ -4,7 +4,7 @@
  *                Web: https://www.corecms.net
  *             Author: 大灰灰
  *              Email: jianweie@163.com
- *         CreateTime: 2022/7/4 23:39:39
+ *         CreateTime: 2025/7/29 16:51:40
  *        Description: 暂无
  ***********************************************************************/
 
@@ -32,142 +32,115 @@ namespace CoreCms.Net.Model.Entities
         [Display(Name = "id")]
         [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
         [Required(ErrorMessage = "请输入{0}")]
-
-
         public System.Int32 id { get; set; }
 
-
         /// <summary>
         /// 用户ID
         /// </summary>
         [Display(Name = "用户ID")]
         [Required(ErrorMessage = "请输入{0}")]
-
-
         public System.Int32 userId { get; set; }
 
-
         /// <summary>
         /// 提现金额
         /// </summary>
         [Display(Name = "提现金额")]
         [Required(ErrorMessage = "请输入{0}")]
-
-
         public System.Decimal money { get; set; }
 
-
         /// <summary>
         /// 银行名称
         /// </summary>
         [Display(Name = "银行名称")]
+
         [StringLength(maximumLength: 60, ErrorMessage = "{0}不能超过{1}字")]
-
-
         public System.String bankName { get; set; }
 
-
         /// <summary>
         /// 银行缩写
         /// </summary>
         [Display(Name = "银行缩写")]
+
         [StringLength(maximumLength: 12, ErrorMessage = "{0}不能超过{1}字")]
-
-
         public System.String bankCode { get; set; }
 
-
         /// <summary>
         /// 账号地区ID
         /// </summary>
         [Display(Name = "账号地区ID")]
         public System.Int32? bankAreaId { get; set; }
 
-
         /// <summary>
         /// 开户行
         /// </summary>
         [Display(Name = "开户行")]
+
         [StringLength(maximumLength: 255, ErrorMessage = "{0}不能超过{1}字")]
-
-
         public System.String accountBank { get; set; }
 
-
         /// <summary>
         /// 账户名
         /// </summary>
         [Display(Name = "账户名")]
+
         [StringLength(maximumLength: 60, ErrorMessage = "{0}不能超过{1}字")]
-
-
         public System.String accountName { get; set; }
 
-
         /// <summary>
         /// 卡号
         /// </summary>
         [Display(Name = "卡号")]
+
         [StringLength(maximumLength: 30, ErrorMessage = "{0}不能超过{1}字")]
-
-
         public System.String cardNumber { get; set; }
 
-
         /// <summary>
         /// 提现服务费
         /// </summary>
         [Display(Name = "提现服务费")]
         [Required(ErrorMessage = "请输入{0}")]
-
-
         public System.Decimal withdrawals { get; set; }
 
-
         /// <summary>
         /// 提现状态
         /// </summary>
         [Display(Name = "提现状态")]
         [Required(ErrorMessage = "请输入{0}")]
-
-
         public System.Int32 status { get; set; }
 
-
         /// <summary>
         /// 创建时间
         /// </summary>
         [Display(Name = "创建时间")]
         [Required(ErrorMessage = "请输入{0}")]
-
-
         public System.DateTime createTime { get; set; }
 
-
         /// <summary>
         /// 更新时间
         /// </summary>
         [Display(Name = "更新时间")]
         public System.DateTime? updateTime { get; set; }
 
-
         /// <summary>
         /// 提现方式
         /// </summary>
         [Display(Name = "提现方式")]
         [Required(ErrorMessage = "请输入{0}")]
-
-
         public System.Int32 type { get; set; }
 
-
         /// <summary>
         /// 反馈结果
         /// </summary>
         [Display(Name = "反馈结果")]
-        [StringLength(maximumLength: 100, ErrorMessage = "{0}不能超过{1}字")]
-
 
+        [StringLength(maximumLength: 1000, ErrorMessage = "{0}不能超过{1}字")]
         public System.String message { get; set; }
+
+        /// <summary>
+        /// 需要用户领取
+        /// </summary>
+        [Display(Name = "需要用户领取")]
+        [Required(ErrorMessage = "请输入{0}")]
+        public System.Boolean needUserGet { get; set; }
     }
 }

CoreCms.Net.Model/Entities/User/CoreCmsUserTocashPartial.cs

@@ -32,5 +32,12 @@ namespace CoreCms.Net.Model.Entities
         [Display(Name = "用户昵称")]
         [SugarColumn(IsIgnore = true)]
         public string userNickName { get; set; }
+
+        /// <summary>
+        /// 商家转账反馈数据
+        /// </summary>
+        [Display(Name = "商家转账反馈数据")]
+        [SugarColumn(IsIgnore = true)]
+        public object merchantTransferData { get; set; }
     }
 }

CoreCms.Net.Model/Entities/User/CoreCmsUserTocashWeChatNotify.cs

@@ -0,0 +1,188 @@
+/***********************************************************************
+ *            Project: CoreCms
+ *        ProjectName: 核心内容管理系统                                
+ *                Web: https://www.corecms.net                      
+ *             Author: 大灰灰                                          
+ *              Email: jianweie@163.com                                
+ *         CreateTime: 2025/8/1 23:54:59
+ *        Description: 暂无
+ ***********************************************************************/
+
+using SqlSugar;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+
+namespace CoreCms.Net.Model.Entities
+{
+    /// <summary>
+    /// 用户提现使用商家转账微信回调通知
+    /// </summary>
+    public partial class CoreCmsUserTocashWeChatNotify
+    {
+        /// <summary>
+        /// 构造函数
+        /// </summary>
+        public CoreCmsUserTocashWeChatNotify()
+        {
+        }
+		
+        /// <summary>
+        /// 序列
+        /// </summary>
+        [Display(Name = "序列")]
+		
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.Int32 id  { get; set; }
+        
+		
+        /// <summary>
+        /// 通知ID
+        /// </summary>
+        [Display(Name = "通知ID")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        [StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")]
+        
+        
+        public System.String callBackId  { get; set; }
+        
+		
+        /// <summary>
+        /// 通知创建时间
+        /// </summary>
+        [Display(Name = "通知创建时间")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        [StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")]
+        
+        
+        public System.String create_time  { get; set; }
+        
+		
+        /// <summary>
+        /// 通知数据类型
+        /// </summary>
+        [Display(Name = "通知数据类型")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        [StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")]
+        
+        
+        public System.String resource_type  { get; set; }
+        
+		
+        /// <summary>
+        /// 通知类型
+        /// </summary>
+        [Display(Name = "通知类型")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        [StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")]
+        
+        
+        public System.String event_type  { get; set; }
+        
+		
+        /// <summary>
+        /// 回调摘要
+        /// </summary>
+        [Display(Name = "回调摘要")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        [StringLength(maximumLength:100,ErrorMessage = "{0}不能超过{1}字")]
+        
+        
+        public System.String summary  { get; set; }
+        
+		
+        /// <summary>
+        /// 通知数据
+        /// </summary>
+        [Display(Name = "通知数据")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.String resource  { get; set; }
+        
+		
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Display(Name = "创建时间")]
+		
+        [Required(ErrorMessage = "请输入{0}")]
+        
+        
+        
+        public System.DateTime createTime  { get; set; }
+        
+		
+        /// <summary>
+        /// 验签的平台证书序列号或支付公钥ID
+        /// </summary>
+        [Display(Name = "验签的平台证书序列号或支付公钥ID")]
+		
+        
+        [StringLength(maximumLength:100,ErrorMessage = "{0}不能超过{1}字")]
+        
+        
+        public System.String wechatpaySerial  { get; set; }
+        
+		
+        /// <summary>
+        /// 验签的签名值
+        /// </summary>
+        [Display(Name = "验签的签名值")]
+		
+        
+        [StringLength(maximumLength:1000,ErrorMessage = "{0}不能超过{1}字")]
+        
+        
+        public System.String wechatpaySignature  { get; set; }
+        
+		
+        /// <summary>
+        /// 验签的时间戳
+        /// </summary>
+        [Display(Name = "验签的时间戳")]
+		
+        
+        [StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")]
+        
+        
+        public System.String wechatpayTimestamp  { get; set; }
+        
+		
+        /// <summary>
+        /// 验签的随机字符串
+        /// </summary>
+        [Display(Name = "验签的随机字符串")]
+		
+        
+        [StringLength(maximumLength:100,ErrorMessage = "{0}不能超过{1}字")]
+        
+        
+        public System.String wechatpayNonce  { get; set; }
+        
+		
+        /// <summary>
+        /// 解密数据
+        /// </summary>
+        [Display(Name = "解密数据")]
+		
+        
+        [StringLength(maximumLength:1000,ErrorMessage = "{0}不能超过{1}字")]
+        
+        
+        public System.String decryptedData  { get; set; }
+        
+		
+    }
+}

CoreCms.Net.Model/Entities/User/CoreCmsUserTocashWeChatResponse.cs

@@ -0,0 +1,105 @@
+/***********************************************************************
+ *            Project: CoreCms
+ *        ProjectName: 核心内容管理系统
+ *                Web: https://www.corecms.net
+ *             Author: 大灰灰
+ *              Email: jianweie@163.com
+ *         CreateTime: 2025/7/23 16:44:04
+ *        Description: 暂无
+ ***********************************************************************/
+
+using SqlSugar;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+
+namespace CoreCms.Net.Model.Entities
+{
+    /// <summary>
+    /// 用户提现使用商家转账回调记录
+    /// </summary>
+    public partial class CoreCmsUserTocashWeChatResponse
+    {
+        /// <summary>
+        /// 构造函数
+        /// </summary>
+        public CoreCmsUserTocashWeChatResponse()
+        {
+        }
+
+        /// <summary>
+        /// 序列
+        /// </summary>
+        [Display(Name = "序列")]
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        [Required(ErrorMessage = "请输入{0}")]
+        public System.Int32 id { get; set; }
+
+        /// <summary>
+        /// 商户单号
+        /// </summary>
+        [Display(Name = "商户单号")]
+        [Required(ErrorMessage = "请输入{0}")]
+        [StringLength(maximumLength: 50, ErrorMessage = "{0}不能超过{1}字")]
+        public System.String out_bill_no { get; set; }
+
+        /// <summary>
+        /// 微信转账单号
+        /// </summary>
+        [Display(Name = "微信转账单号")]
+        [Required(ErrorMessage = "请输入{0}")]
+        [StringLength(maximumLength: 100, ErrorMessage = "{0}不能超过{1}字")]
+        public System.String transfer_bill_no { get; set; }
+
+        /// <summary>
+        /// 单据创建时间
+        /// </summary>
+        [Display(Name = "单据创建时间")]
+        [Required(ErrorMessage = "请输入{0}")]
+        public System.DateTime create_time { get; set; }
+
+        /// <summary>
+        /// 单据状态
+        /// </summary>
+        [Display(Name = "单据状态")]
+        [Required(ErrorMessage = "请输入{0}")]
+        [StringLength(maximumLength: 50, ErrorMessage = "{0}不能超过{1}字")]
+        public System.String state { get; set; }
+
+        /// <summary>
+        /// 跳转领取页面的package信息
+        /// </summary>
+        [Display(Name = "跳转领取页面的package信息")]
+
+        [StringLength(maximumLength: 255, ErrorMessage = "{0}不能超过{1}字")]
+        public System.String package_info { get; set; }
+
+        /// <summary>
+        /// 状态码
+        /// </summary>
+        [Display(Name = "状态码")]
+        public System.Int32? code { get; set; }
+
+        /// <summary>
+        /// 消息内容
+        /// </summary>
+        [Display(Name = "消息内容")]
+
+        [StringLength(maximumLength: 255, ErrorMessage = "{0}不能超过{1}字")]
+        public System.String message { get; set; }
+
+        /// <summary>
+        /// 描述
+        /// </summary>
+        [Display(Name = "描述")]
+
+        [StringLength(maximumLength: 255, ErrorMessage = "{0}不能超过{1}字")]
+        public System.String detail { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Display(Name = "创建时间")]
+        [Required(ErrorMessage = "请输入{0}")]
+        public System.DateTime createTime { get; set; }
+    }
+}

CoreCms.Net.Model/FromBody/FMTransferBillsCallBack.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CoreCms.Net.Model.FromBody
+{
+    /// <summary>
+    /// 商家转账回调通知实体数据
+    /// </summary>
+    public class FMTransferBillsCallBack
+    {
+        /// <summary>
+        /// 通知ID】通知的唯一ID
+        /// </summary>
+        public string id { get; set; }
+
+        /// <summary>
+        /// 【通知创建时间】
+        /// 通知创建的时间，遵循rfc3339标准格式，格式为yyyy-MM-DDTHH:mm:ss+TIMEZONE，yyyy-MM-DD表示年月日，T出现在字符串中，表示time元素的开头，HH:mm:ss.表示时分秒，TIMEZONE表示时区（+08:00表示东八区时间，领先UTC 8小时，即北京时间）。例如：2015-05-20T13:29:35+08:00表示北京时间2015年05月20日13点29分35秒。
+        /// </summary>
+        public string create_time { get; set; }
+
+        /// <summary>
+        /// 【通知数据类型】通知的资源数据类型，商家转账通知为encrypt-resource
+        /// </summary>
+        public string resource_type { get; set; }
+
+        /// <summary>
+        /// 【通知类型】通知的类型，商家转账通知的类型为MCHTRANSFER.BILL.FINISHED
+        /// </summary>
+        public string event_type { get; set; }
+
+        /// <summary>
+        /// 【回调摘要】回调摘要
+        /// </summary>
+        public string summary { get; set; }
+
+        /// <summary>
+        /// 通知数据
+        /// </summary>
+        public FMTransferBillsCallBackResource resource { get; set; }
+
+    }
+
+
+    /// <summary>
+    /// 商家转账回调通知实体数据-通知数据
+    /// </summary>
+    public class FMTransferBillsCallBackResource
+    {
+        /// <summary>
+        /// 【原始类型】原始回调类型，为mch_payment
+        /// </summary>
+        public string original_type { get; set; }
+
+        /// <summary>
+        /// 【加密算法类型】对开启结果数据进行加密的加密算法，目前只支持AEAD_AES_256_GCM
+        /// </summary>
+        public string algorithm { get; set; }
+
+        /// <summary>
+        /// 数据密文】Base64编码后的商家转账结果数据密文
+        /// </summary>
+        public string ciphertext { get; set; }
+
+        /// <summary>
+        /// 【附加数据】附加数据
+        /// </summary>
+        public string? associated_data { get; set; }
+
+        /// <summary>
+        /// 随机串】加密使用的随机串。
+        /// </summary>
+        public string? nonce { get; set; }
+
+    }
+
+}

CoreCms.Net.Repository/Pay/CoreCmsWeChatPayPlatformCertificateRepository.cs

@@ -0,0 +1,212 @@
+/***********************************************************************
+ *            Project: CoreCms
+ *        ProjectName: 核心内容管理系统
+ *                Web: https://www.corecms.net
+ *             Author: 大灰灰
+ *              Email: jianweie@163.com
+ *         CreateTime: 2025/7/21 20:36:56
+ *        Description: 暂无
+ ***********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using CoreCms.Net.Caching.Manual;
+using CoreCms.Net.Configuration;
+using CoreCms.Net.Model.Entities;
+using CoreCms.Net.Model.ViewModels.Basics;
+using CoreCms.Net.IRepository;
+using CoreCms.Net.IRepository.UnitOfWork;
+using CoreCms.Net.Model.ViewModels.UI;
+using SqlSugar;
+
+namespace CoreCms.Net.Repository
+{
+    /// <summary>
+    /// 微信支付平台证书 接口实现
+    /// </summary>
+    public class CoreCmsWeChatPayPlatformCertificateRepository : BaseRepository<CoreCmsWeChatPayPlatformCertificate>, ICoreCmsWeChatPayPlatformCertificateRepository
+    {
+        private readonly IUnitOfWork _unitOfWork;
+
+        public CoreCmsWeChatPayPlatformCertificateRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
+        {
+            _unitOfWork = unitOfWork;
+        }
+
+        #region 实现重写增删改查操作==========================================================
+
+        /// <summary>
+        /// 重写异步插入方法
+        /// </summary>
+        /// <param name="entity">实体数据</param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> InsertAsync(CoreCmsWeChatPayPlatformCertificate entity)
+        {
+            var jm = new AdminUiCallBack();
+
+            var bl = await DbClient.Insertable(entity).ExecuteReturnIdentityAsync() > 0;
+            jm.code = bl ? 0 : 1;
+            jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure;
+
+            return jm;
+        }
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> UpdateAsync(CoreCmsWeChatPayPlatformCertificate entity)
+        {
+            var jm = new AdminUiCallBack();
+
+            var oldModel = await DbClient.Queryable<CoreCmsWeChatPayPlatformCertificate>().In(entity.id).SingleAsync();
+            if (oldModel == null)
+            {
+                jm.msg = "不存在此信息";
+                return jm;
+            }
+            //事物处理过程开始
+            oldModel.id = entity.id;
+            oldModel.algorithmType = entity.algorithmType;
+            oldModel.certificate = entity.certificate;
+            oldModel.effectiveTime = entity.effectiveTime;
+            oldModel.expireTime = entity.expireTime;
+            oldModel.serialNumber = entity.serialNumber;
+            oldModel.merchantId = entity.merchantId;
+            oldModel.createTime = entity.createTime;
+            oldModel.updataTime = entity.updataTime;
+
+            //事物处理过程结束
+            var bl = await DbClient.Updateable(oldModel).ExecuteCommandHasChangeAsync();
+            jm.code = bl ? 0 : 1;
+            jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
+
+            return jm;
+        }
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> UpdateAsync(List<CoreCmsWeChatPayPlatformCertificate> entity)
+        {
+            var jm = new AdminUiCallBack();
+
+            var bl = await DbClient.Updateable(entity).ExecuteCommandHasChangeAsync();
+            jm.code = bl ? 0 : 1;
+            jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
+
+            return jm;
+        }
+
+        /// <summary>
+        /// 重写删除指定ID的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> DeleteByIdAsync(object id)
+        {
+            var jm = new AdminUiCallBack();
+
+            var bl = await DbClient.Deleteable<CoreCmsWeChatPayPlatformCertificate>(id).ExecuteCommandHasChangeAsync();
+            jm.code = bl ? 0 : 1;
+            jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
+
+            return jm;
+        }
+
+        /// <summary>
+        /// 重写删除指定ID集合的数据(批量删除)
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids)
+        {
+            var jm = new AdminUiCallBack();
+
+            var bl = await DbClient.Deleteable<CoreCmsWeChatPayPlatformCertificate>().In(ids).ExecuteCommandHasChangeAsync();
+            jm.code = bl ? 0 : 1;
+            jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
+
+            return jm;
+        }
+
+        #endregion 实现重写增删改查操作==========================================================
+
+        #region 获取缓存的所有数据==========================================================
+
+        /// <summary>
+        /// 获取缓存的所有数据
+        /// </summary>
+        /// <returns></returns>
+        public async Task<List<CoreCmsWeChatPayPlatformCertificate>> GetCaChe()
+        {
+            var list = await DbClient.Queryable<CoreCmsWeChatPayPlatformCertificate>().With(SqlWith.NoLock).WithCache().ToListAsync();
+            return list;
+        }
+
+        #endregion 获取缓存的所有数据==========================================================
+
+        #region 重写根据条件查询分页数据
+
+        /// <summary>
+        ///     重写根据条件查询分页数据
+        /// </summary>
+        /// <param name="predicate">判断集合</param>
+        /// <param name="orderByType">排序方式</param>
+        /// <param name="pageIndex">当前页面索引</param>
+        /// <param name="pageSize">分布大小</param>
+        /// <param name="orderByExpression"></param>
+        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
+        /// <returns></returns>
+        public async Task<IPageList<CoreCmsWeChatPayPlatformCertificate>> QueryPageAsync(Expression<Func<CoreCmsWeChatPayPlatformCertificate, bool>> predicate,
+            Expression<Func<CoreCmsWeChatPayPlatformCertificate, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
+            int pageSize = 20, bool blUseNoLock = false)
+        {
+            RefAsync<int> totalCount = 0;
+            List<CoreCmsWeChatPayPlatformCertificate> page;
+            if (blUseNoLock)
+            {
+                page = await DbClient.Queryable<CoreCmsWeChatPayPlatformCertificate>()
+                .OrderByIF(orderByExpression != null, orderByExpression, orderByType)
+                .WhereIF(predicate != null, predicate).Select(p => new CoreCmsWeChatPayPlatformCertificate
+                {
+                    id = p.id,
+                    algorithmType = p.algorithmType,
+                    certificate = p.certificate,
+                    effectiveTime = p.effectiveTime,
+                    expireTime = p.expireTime,
+                    serialNumber = p.serialNumber,
+                    merchantId = p.merchantId,
+                    createTime = p.createTime,
+                    updataTime = p.updataTime,
+                }).With(SqlWith.NoLock).ToPageListAsync(pageIndex, pageSize, totalCount);
+            }
+            else
+            {
+                page = await DbClient.Queryable<CoreCmsWeChatPayPlatformCertificate>()
+                .OrderByIF(orderByExpression != null, orderByExpression, orderByType)
+                .WhereIF(predicate != null, predicate).Select(p => new CoreCmsWeChatPayPlatformCertificate
+                {
+                    id = p.id,
+                    algorithmType = p.algorithmType,
+                    certificate = p.certificate,
+                    effectiveTime = p.effectiveTime,
+                    expireTime = p.expireTime,
+                    serialNumber = p.serialNumber,
+                    merchantId = p.merchantId,
+                    createTime = p.createTime,
+                    updataTime = p.updataTime,
+                }).ToPageListAsync(pageIndex, pageSize, totalCount);
+            }
+            var list = new PageList<CoreCmsWeChatPayPlatformCertificate>(page, pageIndex, pageSize, totalCount);
+            return list;
+        }
+
+        #endregion 重写根据条件查询分页数据
+    }
+}

CoreCms.Net.Repository/Pay/WeChatPayConfigRepository.cs

@@ -29,12 +29,13 @@ namespace CoreCms.Net.Repository
     public class WeChatPayConfigRepository : BaseRepository<CoreCmsWeChatPayConfig>, IWeChatPayConfigRepository
     {
         private readonly IUnitOfWork _unitOfWork;
+
         public WeChatPayConfigRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
         {
             _unitOfWork = unitOfWork;
         }
 
-       #region 实现重写增删改查操作==========================================================
+        #region 实现重写增删改查操作==========================================================
 
         /// <summary>
         /// 重写异步插入方法
@@ -64,11 +65,11 @@ namespace CoreCms.Net.Repository
             var oldModel = await DbClient.Queryable<CoreCmsWeChatPayConfig>().In(entity.id).SingleAsync();
             if (oldModel == null)
             {
-            jm.msg = "不存在此信息";
+                jm.msg = "不存在此信息";
-            return jm;
+                return jm;
             }
             //事物处理过程开始
-        	oldModel.id = entity.id;
+            //oldModel.id = entity.id;
             oldModel.appId = entity.appId;
             oldModel.mchId = entity.mchId;
             oldModel.apiKey = entity.apiKey;
@@ -83,6 +84,13 @@ namespace CoreCms.Net.Repository
             oldModel.isEnable = entity.isEnable;
             oldModel.isDefault = entity.isDefault;
             oldModel.appType = entity.appType;
+            oldModel.payType = entity.payType;
+            oldModel.certificateSerialNumber = entity.certificateSerialNumber;
+            oldModel.certificatePrivateKey = entity.certificatePrivateKey;
+            oldModel.platformSerialNumber = entity.platformSerialNumber;
+            oldModel.platformPublicKeyId = entity.platformPublicKeyId;
+            oldModel.platformPublicKey = entity.platformPublicKey;
+            oldModel.transferBillsUrl = entity.transferBillsUrl;
 
             //事物处理过程结束
             var bl = await DbClient.Updateable(oldModel).ExecuteCommandHasChangeAsync();
@@ -140,9 +148,9 @@ namespace CoreCms.Net.Repository
             return jm;
         }
 
-        #endregion
+        #endregion 实现重写增删改查操作==========================================================
 
-       #region 获取缓存的所有数据==========================================================
+        #region 获取缓存的所有数据==========================================================
 
         /// <summary>
         /// 获取缓存的所有数据
@@ -150,14 +158,14 @@ namespace CoreCms.Net.Repository
         /// <returns></returns>
         public async Task<List<CoreCmsWeChatPayConfig>> GetCaChe()
         {
-           var list = await DbClient.Queryable<CoreCmsWeChatPayConfig>().With(SqlWith.NoLock).WithCache().ToListAsync();
+            var list = await DbClient.Queryable<CoreCmsWeChatPayConfig>().With(SqlWith.NoLock).WithCache().ToListAsync();
             return list;
         }
 
-        #endregion
+        #endregion 获取缓存的所有数据==========================================================
-
 
         #region 重写根据条件查询分页数据
+
         /// <summary>
         ///     重写根据条件查询分页数据
         /// </summary>
@@ -180,22 +188,28 @@ namespace CoreCms.Net.Repository
                 .OrderByIF(orderByExpression != null, orderByExpression, orderByType)
                 .WhereIF(predicate != null, predicate).Select(p => new CoreCmsWeChatPayConfig
                 {
-                      id = p.id,
+                    id = p.id,
-                appId = p.appId,
+                    appId = p.appId,
-                mchId = p.mchId,
+                    mchId = p.mchId,
-                apiKey = p.apiKey,
+                    apiKey = p.apiKey,
-                apiV3Key = p.apiV3Key,
+                    apiV3Key = p.apiV3Key,
-                certificate = p.certificate,
+                    certificate = p.certificate,
-                rsaPublicKey = p.rsaPublicKey,
+                    rsaPublicKey = p.rsaPublicKey,
-                subAppId = p.subAppId,
+                    subAppId = p.subAppId,
-                subMchId = p.subMchId,
+                    subMchId = p.subMchId,
-                notifyUrl = p.notifyUrl,
+                    notifyUrl = p.notifyUrl,
-                refundUrl = p.refundUrl,
+                    refundUrl = p.refundUrl,
-                jumpUrl = p.jumpUrl,
+                    jumpUrl = p.jumpUrl,
-                isEnable = p.isEnable,
+                    isEnable = p.isEnable,
-                isDefault = p.isDefault,
+                    isDefault = p.isDefault,
-                appType = p.appType,
+                    appType = p.appType,
-                
+                    payType = p.payType,
+                    certificateSerialNumber = p.certificateSerialNumber,
+                    certificatePrivateKey = p.certificatePrivateKey,
+                    platformSerialNumber = p.platformSerialNumber,
+                    platformPublicKey = p.platformPublicKey,
+                    platformPublicKeyId = p.platformPublicKeyId,
+                    transferBillsUrl = p.transferBillsUrl
                 }).With(SqlWith.NoLock).ToPageListAsync(pageIndex, pageSize, totalCount);
             }
             else
@@ -204,29 +218,33 @@ namespace CoreCms.Net.Repository
                 .OrderByIF(orderByExpression != null, orderByExpression, orderByType)
                 .WhereIF(predicate != null, predicate).Select(p => new CoreCmsWeChatPayConfig
                 {
-                      id = p.id,
+                    id = p.id,
-                appId = p.appId,
+                    appId = p.appId,
-                mchId = p.mchId,
+                    mchId = p.mchId,
-                apiKey = p.apiKey,
+                    apiKey = p.apiKey,
-                apiV3Key = p.apiV3Key,
+                    apiV3Key = p.apiV3Key,
-                certificate = p.certificate,
+                    certificate = p.certificate,
-                rsaPublicKey = p.rsaPublicKey,
+                    rsaPublicKey = p.rsaPublicKey,
-                subAppId = p.subAppId,
+                    subAppId = p.subAppId,
-                subMchId = p.subMchId,
+                    subMchId = p.subMchId,
-                notifyUrl = p.notifyUrl,
+                    notifyUrl = p.notifyUrl,
-                refundUrl = p.refundUrl,
+                    refundUrl = p.refundUrl,
-                jumpUrl = p.jumpUrl,
+                    jumpUrl = p.jumpUrl,
-                isEnable = p.isEnable,
+                    isEnable = p.isEnable,
-                isDefault = p.isDefault,
+                    isDefault = p.isDefault,
-                appType = p.appType,
+                    appType = p.appType,
-                
+                    certificateSerialNumber = p.certificateSerialNumber,
+                    certificatePrivateKey = p.certificatePrivateKey,
+                    platformSerialNumber = p.platformSerialNumber,
+                    platformPublicKey = p.platformPublicKey,
+                    platformPublicKeyId = p.platformPublicKeyId,
+                    transferBillsUrl = p.transferBillsUrl
                 }).ToPageListAsync(pageIndex, pageSize, totalCount);
             }
             var list = new PageList<CoreCmsWeChatPayConfig>(page, pageIndex, pageSize, totalCount);
             return list;
         }
 
-        #endregion
+        #endregion 重写根据条件查询分页数据
-
     }
 }

CoreCms.Net.Repository/User/CoreCmsUserTocashRepository.cs

@@ -69,7 +69,8 @@ namespace CoreCms.Net.Repository
                         updateTime = p.updateTime,
                         userNickName = sc.nickName,
                         type = p.type,
-                        message = p.message
+                        message = p.message,
+                        needUserGet = p.needUserGet
                     })
                     .With(SqlWith.NoLock)
                     .MergeTable()
@@ -96,7 +97,8 @@ namespace CoreCms.Net.Repository
                         updateTime = p.updateTime,
                         userNickName = sc.nickName,
                         type = p.type,
-                        message = p.message
+                        message = p.message,
+                        needUserGet = p.needUserGet
                     })
                     .MergeTable()
                     .OrderByIF(orderByExpression != null, orderByExpression, orderByType)

CoreCms.Net.Repository/User/CoreCmsUserTocashWeChatNotifyRepository.cs

@@ -0,0 +1,223 @@
+/***********************************************************************
+ *            Project: CoreCms
+ *        ProjectName: 核心内容管理系统                                
+ *                Web: https://www.corecms.net                      
+ *             Author: 大灰灰                                          
+ *              Email: jianweie@163.com                                
+ *         CreateTime: 2025/8/1 23:54:59
+ *        Description: 暂无
+ ***********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using CoreCms.Net.Caching.Manual;
+using CoreCms.Net.Configuration;
+using CoreCms.Net.Model.Entities;
+using CoreCms.Net.Model.ViewModels.Basics;
+using CoreCms.Net.IRepository;
+using CoreCms.Net.IRepository.UnitOfWork;
+using CoreCms.Net.Model.ViewModels.UI;
+using SqlSugar;
+
+namespace CoreCms.Net.Repository
+{
+    /// <summary>
+    /// 用户提现使用商家转账微信回调通知 接口实现
+    /// </summary>
+    public class CoreCmsUserTocashWeChatNotifyRepository : BaseRepository<CoreCmsUserTocashWeChatNotify>, ICoreCmsUserTocashWeChatNotifyRepository
+    {
+        private readonly IUnitOfWork _unitOfWork;
+        public CoreCmsUserTocashWeChatNotifyRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
+        {
+            _unitOfWork = unitOfWork;
+        }
+
+        #region 实现重写增删改查操作==========================================================
+
+
+        /// <summary>
+        /// 重写异步插入方法（返回序列）
+        /// </summary>
+        /// <param name="entity">实体数据</param>
+        /// <returns></returns>
+        public async Task<int> ExecuteReturnIdentityAsync(CoreCmsUserTocashWeChatNotify entity)
+        {
+            var id = await DbClient.Insertable(entity).ExecuteReturnIdentityAsync();
+            return id;
+        }
+
+        /// <summary>
+        /// 重写异步插入方法
+        /// </summary>
+        /// <param name="entity">实体数据</param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> InsertAsync(CoreCmsUserTocashWeChatNotify entity)
+        {
+            var jm = new AdminUiCallBack();
+
+            var bl = await DbClient.Insertable(entity).ExecuteReturnIdentityAsync() > 0;
+            jm.code = bl ? 0 : 1;
+            jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure;
+
+            return jm;
+        }
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> UpdateAsync(CoreCmsUserTocashWeChatNotify entity)
+        {
+            var jm = new AdminUiCallBack();
+
+            var oldModel = await DbClient.Queryable<CoreCmsUserTocashWeChatNotify>().In(entity.id).SingleAsync();
+            if (oldModel == null)
+            {
+                jm.msg = "不存在此信息";
+                return jm;
+            }
+            //事物处理过程开始
+            //oldModel.id = entity.id;
+            oldModel.callBackId = entity.callBackId;
+            oldModel.create_time = entity.create_time;
+            oldModel.resource_type = entity.resource_type;
+            oldModel.event_type = entity.event_type;
+            oldModel.summary = entity.summary;
+            oldModel.resource = entity.resource;
+            oldModel.createTime = entity.createTime;
+            oldModel.wechatpaySerial = entity.wechatpaySerial;
+            oldModel.wechatpaySignature = entity.wechatpaySignature;
+            oldModel.wechatpayTimestamp = entity.wechatpayTimestamp;
+            oldModel.wechatpayNonce = entity.wechatpayNonce;
+            oldModel.decryptedData = entity.decryptedData;
+
+            //事物处理过程结束
+            var bl = await DbClient.Updateable(oldModel).ExecuteCommandHasChangeAsync();
+            jm.code = bl ? 0 : 1;
+            jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
+
+            return jm;
+        }
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> UpdateAsync(List<CoreCmsUserTocashWeChatNotify> entity)
+        {
+            var jm = new AdminUiCallBack();
+
+            var bl = await DbClient.Updateable(entity).ExecuteCommandHasChangeAsync();
+            jm.code = bl ? 0 : 1;
+            jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
+
+            return jm;
+        }
+
+        /// <summary>
+        /// 重写删除指定ID的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> DeleteByIdAsync(object id)
+        {
+            var jm = new AdminUiCallBack();
+
+            var bl = await DbClient.Deleteable<CoreCmsUserTocashWeChatNotify>(id).ExecuteCommandHasChangeAsync();
+            jm.code = bl ? 0 : 1;
+            jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
+
+            return jm;
+        }
+
+        /// <summary>
+        /// 重写删除指定ID集合的数据(批量删除)
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids)
+        {
+            var jm = new AdminUiCallBack();
+
+            var bl = await DbClient.Deleteable<CoreCmsUserTocashWeChatNotify>().In(ids).ExecuteCommandHasChangeAsync();
+            jm.code = bl ? 0 : 1;
+            jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
+
+            return jm;
+        }
+
+        #endregion
+
+        #region 重写根据条件查询分页数据
+        /// <summary>
+        ///     重写根据条件查询分页数据
+        /// </summary>
+        /// <param name="predicate">判断集合</param>
+        /// <param name="orderByType">排序方式</param>
+        /// <param name="pageIndex">当前页面索引</param>
+        /// <param name="pageSize">分布大小</param>
+        /// <param name="orderByExpression"></param>
+        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
+        /// <returns></returns>
+        public async Task<IPageList<CoreCmsUserTocashWeChatNotify>> QueryPageAsync(Expression<Func<CoreCmsUserTocashWeChatNotify, bool>> predicate,
+            Expression<Func<CoreCmsUserTocashWeChatNotify, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
+            int pageSize = 20, bool blUseNoLock = false)
+        {
+            RefAsync<int> totalCount = 0;
+            List<CoreCmsUserTocashWeChatNotify> page;
+            if (blUseNoLock)
+            {
+                page = await DbClient.Queryable<CoreCmsUserTocashWeChatNotify>()
+                .OrderByIF(orderByExpression != null, orderByExpression, orderByType)
+                .WhereIF(predicate != null, predicate).Select(p => new CoreCmsUserTocashWeChatNotify
+                {
+                    id = p.id,
+                    callBackId = p.callBackId,
+                    create_time = p.create_time,
+                    resource_type = p.resource_type,
+                    event_type = p.event_type,
+                    summary = p.summary,
+                    resource = p.resource,
+                    createTime = p.createTime,
+                    wechatpaySerial = p.wechatpaySerial,
+                    wechatpaySignature = p.wechatpaySignature,
+                    wechatpayTimestamp = p.wechatpayTimestamp,
+                    wechatpayNonce = p.wechatpayNonce,
+                    decryptedData = p.decryptedData,
+
+                }).With(SqlWith.NoLock).ToPageListAsync(pageIndex, pageSize, totalCount);
+            }
+            else
+            {
+                page = await DbClient.Queryable<CoreCmsUserTocashWeChatNotify>()
+                .OrderByIF(orderByExpression != null, orderByExpression, orderByType)
+                .WhereIF(predicate != null, predicate).Select(p => new CoreCmsUserTocashWeChatNotify
+                {
+                    id = p.id,
+                    callBackId = p.callBackId,
+                    create_time = p.create_time,
+                    resource_type = p.resource_type,
+                    event_type = p.event_type,
+                    summary = p.summary,
+                    resource = p.resource,
+                    createTime = p.createTime,
+                    wechatpaySerial = p.wechatpaySerial,
+                    wechatpaySignature = p.wechatpaySignature,
+                    wechatpayTimestamp = p.wechatpayTimestamp,
+                    wechatpayNonce = p.wechatpayNonce,
+                    decryptedData = p.decryptedData,
+
+                }).ToPageListAsync(pageIndex, pageSize, totalCount);
+            }
+            var list = new PageList<CoreCmsUserTocashWeChatNotify>(page, pageIndex, pageSize, totalCount);
+            return list;
+        }
+
+        #endregion
+
+    }
+}

CoreCms.Net.Repository/User/CoreCmsUserTocashWeChatResponseRepository.cs

@@ -0,0 +1,201 @@
+/***********************************************************************
+ *            Project: CoreCms
+ *        ProjectName: 核心内容管理系统
+ *                Web: https://www.corecms.net
+ *             Author: 大灰灰
+ *              Email: jianweie@163.com
+ *         CreateTime: 2025/7/23 16:37:18
+ *        Description: 暂无
+ ***********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using CoreCms.Net.Caching.Manual;
+using CoreCms.Net.Configuration;
+using CoreCms.Net.Model.Entities;
+using CoreCms.Net.Model.ViewModels.Basics;
+using CoreCms.Net.IRepository;
+using CoreCms.Net.IRepository.UnitOfWork;
+using CoreCms.Net.Model.ViewModels.UI;
+using SqlSugar;
+
+namespace CoreCms.Net.Repository
+{
+    /// <summary>
+    /// 用户提现使用商家转账回调记录 接口实现
+    /// </summary>
+    public class CoreCmsUserTocashWeChatResponseRepository : BaseRepository<CoreCmsUserTocashWeChatResponse>, ICoreCmsUserTocashWeChatResponseRepository
+    {
+        private readonly IUnitOfWork _unitOfWork;
+
+        public CoreCmsUserTocashWeChatResponseRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
+        {
+            _unitOfWork = unitOfWork;
+        }
+
+        #region 实现重写增删改查操作==========================================================
+
+        /// <summary>
+        /// 重写异步插入方法
+        /// </summary>
+        /// <param name="entity">实体数据</param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> InsertAsync(CoreCmsUserTocashWeChatResponse entity)
+        {
+            var jm = new AdminUiCallBack();
+
+            var bl = await DbClient.Insertable(entity).ExecuteReturnIdentityAsync() > 0;
+            jm.code = bl ? 0 : 1;
+            jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure;
+
+            return jm;
+        }
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> UpdateAsync(CoreCmsUserTocashWeChatResponse entity)
+        {
+            var jm = new AdminUiCallBack();
+
+            var oldModel = await DbClient.Queryable<CoreCmsUserTocashWeChatResponse>().In(entity.id).SingleAsync();
+            if (oldModel == null)
+            {
+                jm.msg = "不存在此信息";
+                return jm;
+            }
+            //事物处理过程开始
+            oldModel.id = entity.id;
+            oldModel.out_bill_no = entity.out_bill_no;
+            oldModel.transfer_bill_no = entity.transfer_bill_no;
+            oldModel.create_time = entity.create_time;
+            oldModel.state = entity.state;
+            oldModel.package_info = entity.package_info;
+            oldModel.code = entity.code;
+            oldModel.message = entity.message;
+            oldModel.detail = entity.detail;
+            oldModel.createTime = entity.createTime;
+
+            //事物处理过程结束
+            var bl = await DbClient.Updateable(oldModel).ExecuteCommandHasChangeAsync();
+            jm.code = bl ? 0 : 1;
+            jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
+
+            return jm;
+        }
+
+        /// <summary>
+        /// 重写异步更新方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> UpdateAsync(List<CoreCmsUserTocashWeChatResponse> entity)
+        {
+            var jm = new AdminUiCallBack();
+
+            var bl = await DbClient.Updateable(entity).ExecuteCommandHasChangeAsync();
+            jm.code = bl ? 0 : 1;
+            jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
+
+            return jm;
+        }
+
+        /// <summary>
+        /// 重写删除指定ID的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> DeleteByIdAsync(object id)
+        {
+            var jm = new AdminUiCallBack();
+
+            var bl = await DbClient.Deleteable<CoreCmsUserTocashWeChatResponse>(id).ExecuteCommandHasChangeAsync();
+            jm.code = bl ? 0 : 1;
+            jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
+
+            return jm;
+        }
+
+        /// <summary>
+        /// 重写删除指定ID集合的数据(批量删除)
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids)
+        {
+            var jm = new AdminUiCallBack();
+
+            var bl = await DbClient.Deleteable<CoreCmsUserTocashWeChatResponse>().In(ids).ExecuteCommandHasChangeAsync();
+            jm.code = bl ? 0 : 1;
+            jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure;
+
+            return jm;
+        }
+
+        #endregion 实现重写增删改查操作==========================================================
+
+        #region 重写根据条件查询分页数据
+
+        /// <summary>
+        ///     重写根据条件查询分页数据
+        /// </summary>
+        /// <param name="predicate">判断集合</param>
+        /// <param name="orderByType">排序方式</param>
+        /// <param name="pageIndex">当前页面索引</param>
+        /// <param name="pageSize">分布大小</param>
+        /// <param name="orderByExpression"></param>
+        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
+        /// <returns></returns>
+        public async Task<IPageList<CoreCmsUserTocashWeChatResponse>> QueryPageAsync(Expression<Func<CoreCmsUserTocashWeChatResponse, bool>> predicate,
+            Expression<Func<CoreCmsUserTocashWeChatResponse, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
+            int pageSize = 20, bool blUseNoLock = false)
+        {
+            RefAsync<int> totalCount = 0;
+            List<CoreCmsUserTocashWeChatResponse> page;
+            if (blUseNoLock)
+            {
+                page = await DbClient.Queryable<CoreCmsUserTocashWeChatResponse>()
+                .OrderByIF(orderByExpression != null, orderByExpression, orderByType)
+                .WhereIF(predicate != null, predicate).Select(p => new CoreCmsUserTocashWeChatResponse
+                {
+                    id = p.id,
+                    out_bill_no = p.out_bill_no,
+                    transfer_bill_no = p.transfer_bill_no,
+                    create_time = p.create_time,
+                    state = p.state,
+                    package_info = p.package_info,
+                    code = p.code,
+                    message = p.message,
+                    detail = p.detail,
+                    createTime = p.createTime,
+                }).With(SqlWith.NoLock).ToPageListAsync(pageIndex, pageSize, totalCount);
+            }
+            else
+            {
+                page = await DbClient.Queryable<CoreCmsUserTocashWeChatResponse>()
+                .OrderByIF(orderByExpression != null, orderByExpression, orderByType)
+                .WhereIF(predicate != null, predicate).Select(p => new CoreCmsUserTocashWeChatResponse
+                {
+                    id = p.id,
+                    out_bill_no = p.out_bill_no,
+                    transfer_bill_no = p.transfer_bill_no,
+                    create_time = p.create_time,
+                    state = p.state,
+                    package_info = p.package_info,
+                    code = p.code,
+                    message = p.message,
+                    detail = p.detail,
+                    createTime = p.createTime,
+                }).ToPageListAsync(pageIndex, pageSize, totalCount);
+            }
+            var list = new PageList<CoreCmsUserTocashWeChatResponse>(page, pageIndex, pageSize, totalCount);
+            return list;
+        }
+
+        #endregion 重写根据条件查询分页数据
+    }
+}

CoreCms.Net.Services/CoreCms.Net.Services.csproj

@@ -16,6 +16,7 @@
     <PackageReference Include="Qiniu" Version="8.7.0" />
     <PackageReference Include="QRCoder" Version="1.6.0" />
     <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.3" />
+    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.13.0" />
     <PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
     <PackageReference Include="System.Drawing.Common" Version="9.0.0" />
     <PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.40" />

CoreCms.Net.Services/Pay/CoreCmsWeChatPayPlatformCertificateServices.cs

@@ -0,0 +1,129 @@
+/***********************************************************************
+ *            Project: CoreCms
+ *        ProjectName: 核心内容管理系统
+ *                Web: https://www.corecms.net
+ *             Author: 大灰灰
+ *              Email: jianweie@163.com
+ *         CreateTime: 2025/7/21 20:36:56
+ *        Description: 暂无
+ ***********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using CoreCms.Net.Configuration;
+using CoreCms.Net.IRepository;
+using CoreCms.Net.IRepository.UnitOfWork;
+using CoreCms.Net.IServices;
+using CoreCms.Net.Model.Entities;
+using CoreCms.Net.Model.ViewModels.Basics;
+using CoreCms.Net.Model.ViewModels.UI;
+using SqlSugar;
+
+namespace CoreCms.Net.Services
+{
+    /// <summary>
+    /// 微信支付平台证书 接口实现
+    /// </summary>
+    public class CoreCmsWeChatPayPlatformCertificateServices : BaseServices<CoreCmsWeChatPayPlatformCertificate>, ICoreCmsWeChatPayPlatformCertificateServices
+    {
+        private readonly ICoreCmsWeChatPayPlatformCertificateRepository _dal;
+        private readonly IUnitOfWork _unitOfWork;
+
+        public CoreCmsWeChatPayPlatformCertificateServices(IUnitOfWork unitOfWork, ICoreCmsWeChatPayPlatformCertificateRepository dal)
+        {
+            this._dal = dal;
+            base.BaseDal = dal;
+            _unitOfWork = unitOfWork;
+        }
+
+        #region 实现重写增删改查操作==========================================================
+
+        /// <summary>
+        /// 重写异步插入方法
+        /// </summary>
+        /// <param name="entity">实体数据</param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> InsertAsync(CoreCmsWeChatPayPlatformCertificate entity)
+        {
+            return await _dal.InsertAsync(entity);
+        }
+
+        /// <summary>
+        /// 重写异步更新方法方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> UpdateAsync(CoreCmsWeChatPayPlatformCertificate entity)
+        {
+            return await _dal.UpdateAsync(entity);
+        }
+
+        /// <summary>
+        /// 重写异步更新方法方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> UpdateAsync(List<CoreCmsWeChatPayPlatformCertificate> entity)
+        {
+            return await _dal.UpdateAsync(entity);
+        }
+
+        /// <summary>
+        /// 重写删除指定ID的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> DeleteByIdAsync(object id)
+        {
+            return await _dal.DeleteByIdAsync(id);
+        }
+
+        /// <summary>
+        /// 重写删除指定ID集合的数据(批量删除)
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids)
+        {
+            return await _dal.DeleteByIdsAsync(ids);
+        }
+
+        #endregion 实现重写增删改查操作==========================================================
+
+        #region 获取缓存的所有数据==========================================================
+
+        /// <summary>
+        /// 获取缓存的所有数据
+        /// </summary>
+        /// <returns></returns>
+        public async Task<List<CoreCmsWeChatPayPlatformCertificate>> GetCaChe()
+        {
+            return await _dal.GetCaChe();
+        }
+
+        #endregion 获取缓存的所有数据==========================================================
+
+        #region 重写根据条件查询分页数据
+
+        /// <summary>
+        ///     重写根据条件查询分页数据
+        /// </summary>
+        /// <param name="predicate">判断集合</param>
+        /// <param name="orderByType">排序方式</param>
+        /// <param name="pageIndex">当前页面索引</param>
+        /// <param name="pageSize">分布大小</param>
+        /// <param name="orderByExpression"></param>
+        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
+        /// <returns></returns>
+        public async Task<IPageList<CoreCmsWeChatPayPlatformCertificate>> QueryPageAsync(Expression<Func<CoreCmsWeChatPayPlatformCertificate, bool>> predicate,
+            Expression<Func<CoreCmsWeChatPayPlatformCertificate, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
+            int pageSize = 20, bool blUseNoLock = false)
+        {
+            return await _dal.QueryPageAsync(predicate, orderByExpression, orderByType, pageIndex, pageSize, blUseNoLock);
+        }
+
+        #endregion 重写根据条件查询分页数据
+    }
+}

CoreCms.Net.Services/User/CoreCmsUserTocashServices.cs

@@ -8,11 +8,6 @@
  *        Description: 暂无
  ***********************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Threading.Tasks;
 using CoreCms.Net.Caching.AccressToken;
 using CoreCms.Net.Configuration;
 using CoreCms.Net.IRepository;
@@ -31,14 +26,27 @@ using Essensoft.Paylink.WeChatPay.V2;
 using Essensoft.Paylink.WeChatPay.V2.Request;
 using Essensoft.Paylink.WeChatPay.V3.Domain;
 using Essensoft.Paylink.WeChatPay.V3.Request;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
+using SKIT.FlurlHttpClient.Wechat.Api.Models;
+using SKIT.FlurlHttpClient.Wechat.TenpayV3;
+using SKIT.FlurlHttpClient.Wechat.TenpayV3.Models;
+using SKIT.FlurlHttpClient.Wechat.TenpayV3.Settings;
 using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Net.Http;
+using System.Threading.Tasks;
 using Yitter.IdGenerator;
-using Microsoft.AspNetCore.Hosting;
+using NLog;
+
+using static SKIT.FlurlHttpClient.Wechat.Api.Models.ECFinderLiveGetFinderLiveNoticeRecordListResponse.Types;
 
 
 namespace CoreCms.Net.Services
@@ -60,11 +68,12 @@ namespace CoreCms.Net.Services
 
         private readonly IWebHostEnvironment _webHostEnvironment;
         private readonly IWeChatPayConfigServices _weChatPayConfigServices;
-
+        private readonly IWechatTenpayClientFactory _wechatTenpayClientFactory;
+        private readonly ICoreCmsUserTocashWeChatResponseServices _userTocashWeChatResponseServices;
 
 
         public CoreCmsUserTocashServices(IUnitOfWork unitOfWork, ICoreCmsUserTocashRepository dal,
-            IServiceProvider serviceProvider, ICoreCmsUserServices userServices, ICoreCmsUserBalanceServices userBalanceServices, ICoreCmsUserWeChatInfoServices weChatInfoServices, IWeChatPayClient v2Client, IHttpContextAccessor httpContextAccessor, IWebHostEnvironment webHostEnvironment, Essensoft.Paylink.WeChatPay.V3.IWeChatPayClient v3Client, IWeChatPayConfigServices weChatPayConfigServices)
+            IServiceProvider serviceProvider, ICoreCmsUserServices userServices, ICoreCmsUserBalanceServices userBalanceServices, ICoreCmsUserWeChatInfoServices weChatInfoServices, IWeChatPayClient v2Client, IHttpContextAccessor httpContextAccessor, IWebHostEnvironment webHostEnvironment, Essensoft.Paylink.WeChatPay.V3.IWeChatPayClient v3Client, IWeChatPayConfigServices weChatPayConfigServices, IWechatTenpayClientFactory wechatTenpayClientFactory, ICoreCmsUserTocashWeChatResponseServices userTocashWeChatResponseServices)
         {
             this._dal = dal;
             base.BaseDal = dal;
@@ -78,6 +87,8 @@ namespace CoreCms.Net.Services
             _webHostEnvironment = webHostEnvironment;
             _v3Client = v3Client;
             _weChatPayConfigServices = weChatPayConfigServices;
+            _wechatTenpayClientFactory = wechatTenpayClientFactory;
+            _userTocashWeChatResponseServices = userTocashWeChatResponseServices;
         }
 
         /// <summary>
@@ -162,6 +173,7 @@ namespace CoreCms.Net.Services
             cashModel.withdrawals = cateMoney;
             cashModel.createTime = DateTime.Now;
             cashModel.type = (int)GlobalEnumVars.UserTocashType.银行线下转账;
+            cashModel.needUserGet = false;
 
             var res = await _dal.InsertAsync(cashModel);
             if (res > 0)
@@ -192,6 +204,9 @@ namespace CoreCms.Net.Services
         public async Task<WebApiCallBack> UserToCashList(int userId = 0, int page = 1, int limit = 10, int status = 0)
         {
             var jm = new WebApiCallBack();
+            using var container = _serviceProvider.CreateScope();
+            var weChatPayConfigServices = container.ServiceProvider.GetService<IWeChatPayConfigServices>();
+
 
             var where = PredicateBuilder.True<CoreCmsUserTocash>();
             if (status > 0)
@@ -205,12 +220,27 @@ namespace CoreCms.Net.Services
             var list = await _dal.QueryPageAsync(where, p => p.createTime, OrderByType.Desc, page, limit);
             if (list.Any())
             {
+
+                //获取商家转账的初始数据
+                var payConfig = await weChatPayConfigServices.QueryByClauseAsync(p =>
+                    p.isDefault == true && p.isEnable == true &&
+                    p.appType == nameof(GlobalEnumVars.WeiChatPayTradeType.JSAPI));
+
                 foreach (var item in list)
                 {
                     item.statusName = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.UserTocashStatus>(item.status);
                     item.cardNumber = UserHelper.BankCardNoFormat(item.cardNumber);
+                    if (item.type == (int)GlobalEnumVars.UserTocashType.商家转账 && item.needUserGet)
+                    {
+                        item.merchantTransferData = new
+                        {
+                            payConfig.appId,
+                            payConfig.mchId
+                        };
+                    }
                 }
             }
+
             jm.status = true;
             jm.data = list;
             jm.otherData = new
@@ -508,6 +538,124 @@ namespace CoreCms.Net.Services
                         break;
                     }
 
+                case (int)GlobalEnumVars.UserTocashType.商家转账:
+                    {
+                        var user = await _userServices.QueryByIdAsync(info.userId);
+                        if (user == null)
+                        {
+                            jm.msg = "用户信息获取失败";
+                            return jm;
+                        }
+                        var weChatUserInfo = await _weChatInfoServices.QueryByClauseAsync(p => p.userId == info.userId);
+                        if (weChatUserInfo == null)
+                        {
+                            jm.msg = "微信用户数据获取失败";
+                            return jm;
+                        }
+
+                        var config = await _weChatPayConfigServices.QueryByClauseAsync(p => p.isDefault == true && p.isEnable == true);
+                        if (config == null)
+                        {
+                            jm.msg = "支付配置信息获取失败";
+                            return jm;
+                        }
+
+                        var client = await _wechatTenpayClientFactory.Create(config.mchId);
+
+                        var request = new CreateFundAppMerchantTransferBillRequest();
+
+                        request.WechatpaySerialNumber = config.payType switch
+                        {
+                            (int)GlobalEnumVars.WeChatPayIdentityVerificationMethods.PlatformCertificate => config
+                                .platformSerialNumber,
+                            (int)GlobalEnumVars.WeChatPayIdentityVerificationMethods.PlatformPublicKey => config
+                                .platformPublicKeyId,
+                            _ => request.WechatpaySerialNumber
+                        };
+
+                        request.AppId = config.appId;
+                        request.OutBillNumber = "usertocash" + info.id;
+                        request.TransferSceneId = "1000";
+                        request.OpenId = weChatUserInfo.openid;
+
+                        //按分计算
+                        request.TransferAmount = Convert.ToInt32(info.money * 100);
+                        if (request.TransferAmount > 30)
+                        {
+                            request.UserName = info.accountName;
+                        }
+
+                        request.TransferRemark = "客户推广业务佣金提现处理";
+                        request.NotifyUrl = config.transferBillsUrl;
+                        request.TransferSceneReportInfoList = new List<CreateFundAppMerchantTransferBillRequest.Types.TransferSceneReportInfo>()
+                            {
+                                new CreateFundAppMerchantTransferBillRequest.Types.TransferSceneReportInfo()
+                                {
+                                    InfoType = "活动名称",
+                                    InfoContent = "分销佣金提现",
+                                },
+                                new CreateFundAppMerchantTransferBillRequest.Types.TransferSceneReportInfo()
+                                {
+                                    InfoType = "奖励说明",
+                                    InfoContent = "用户分销佣金提现申请",
+                                }
+                            };
+
+                        var response = await client.ExecuteCreateFundAppMerchantTransferBillAsync(request);
+                        if (response.IsSuccessful())
+                        {
+                            status = (int)GlobalEnumVars.UserTocashStatus.提现成功;
+                            var message = JsonConvert.SerializeObject(new
+                            {
+                                response
+                            });
+
+                            bool needUserGet = response.State == "WAIT_USER_CONFIRM";
+
+                            var bl = await _dal.UpdateAsync(p => new CoreCmsUserTocash() { status = status, updateTime = DateTime.Now, message = message, type = type, needUserGet = needUserGet }, p => p.id == id && (p.status == (int)GlobalEnumVars.UserTocashStatus.待审核 || p.status == (int)GlobalEnumVars.UserTocashStatus.提现异常));
+
+                            NLogUtil.WriteAll(LogLevel.Trace, LogType.Refund, "微信提现商家转账回调（成功）", JsonConvert.SerializeObject(new
+                            {
+                                response,
+                                request
+                            }));
+
+                            var log = new CoreCmsUserTocashWeChatResponse();
+                            log.out_bill_no = response.OutBillNumber;
+                            log.transfer_bill_no = response.TransferBillNumber;
+                            log.state = response.State;
+                            log.create_time = response.CreateTime.DateTime;
+                            log.package_info = response.PackageInfo;
+                            log.message = response.FailReason;
+                            log.createTime = DateTime.Now;
+                            await _userTocashWeChatResponseServices.InsertAsync(log);
+
+
+                            jm.status = bl;
+                            jm.data = status;
+                        }
+                        else
+                        {
+                            status = (int)GlobalEnumVars.UserTocashStatus.提现异常;
+                            var message = JsonConvert.SerializeObject(new
+                            {
+                                response
+                            });
+
+                            var bl = await _dal.UpdateAsync(p => new CoreCmsUserTocash() { status = status, updateTime = DateTime.Now, message = message, type = type }, p => p.id == id && (p.status == (int)GlobalEnumVars.UserTocashStatus.待审核 || p.status == (int)GlobalEnumVars.UserTocashStatus.提现异常));
+
+                            NLogUtil.WriteAll(LogLevel.Trace, LogType.Refund, "微信提现商家转账回调（失败）", JsonConvert.SerializeObject(new
+                            {
+                                response,
+                                request
+                            }));
+
+                            jm.status = bl;
+                            jm.data = status;
+                        }
+
+                        break;
+                    }
                 default:
                     jm.msg = "提现方式获取失败";
                     jm.status = false;

CoreCms.Net.Services/User/CoreCmsUserTocashWeChatNotifyServices.cs

@@ -0,0 +1,126 @@
+/***********************************************************************
+ *            Project: CoreCms
+ *        ProjectName: 核心内容管理系统
+ *                Web: https://www.corecms.net
+ *             Author: 大灰灰
+ *              Email: jianweie@163.com
+ *         CreateTime: 2025/7/28 23:08:04
+ *        Description: 暂无
+ ***********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using CoreCms.Net.Configuration;
+using CoreCms.Net.IRepository;
+using CoreCms.Net.IRepository.UnitOfWork;
+using CoreCms.Net.IServices;
+using CoreCms.Net.Model.Entities;
+using CoreCms.Net.Model.ViewModels.Basics;
+using CoreCms.Net.Model.ViewModels.UI;
+using SqlSugar;
+
+namespace CoreCms.Net.Services
+{
+    /// <summary>
+    /// 用户提现使用商家转账微信回调通知 接口实现
+    /// </summary>
+    public class CoreCmsUserTocashWeChatNotifyServices : BaseServices<CoreCmsUserTocashWeChatNotify>, ICoreCmsUserTocashWeChatNotifyServices
+    {
+        private readonly ICoreCmsUserTocashWeChatNotifyRepository _dal;
+        private readonly IUnitOfWork _unitOfWork;
+
+        public CoreCmsUserTocashWeChatNotifyServices(IUnitOfWork unitOfWork, ICoreCmsUserTocashWeChatNotifyRepository dal)
+        {
+            this._dal = dal;
+            base.BaseDal = dal;
+            _unitOfWork = unitOfWork;
+        }
+
+        #region 实现重写增删改查操作==========================================================
+
+        /// <summary>
+        /// 重写异步插入方法（返回序列）
+        /// </summary>
+        /// <param name="entity">实体数据</param>
+        /// <returns></returns>
+        public async Task<int> ExecuteReturnIdentityAsync(CoreCmsUserTocashWeChatNotify entity)
+        {
+            return await _dal.ExecuteReturnIdentityAsync(entity);
+        }
+
+        /// <summary>
+        /// 重写异步插入方法
+        /// </summary>
+        /// <param name="entity">实体数据</param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> InsertAsync(CoreCmsUserTocashWeChatNotify entity)
+        {
+            return await _dal.InsertAsync(entity);
+        }
+
+        /// <summary>
+        /// 重写异步更新方法方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> UpdateAsync(CoreCmsUserTocashWeChatNotify entity)
+        {
+            return await _dal.UpdateAsync(entity);
+        }
+
+        /// <summary>
+        /// 重写异步更新方法方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> UpdateAsync(List<CoreCmsUserTocashWeChatNotify> entity)
+        {
+            return await _dal.UpdateAsync(entity);
+        }
+
+        /// <summary>
+        /// 重写删除指定ID的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> DeleteByIdAsync(object id)
+        {
+            return await _dal.DeleteByIdAsync(id);
+        }
+
+        /// <summary>
+        /// 重写删除指定ID集合的数据(批量删除)
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids)
+        {
+            return await _dal.DeleteByIdsAsync(ids);
+        }
+
+        #endregion 实现重写增删改查操作==========================================================
+
+        #region 重写根据条件查询分页数据
+
+        /// <summary>
+        ///     重写根据条件查询分页数据
+        /// </summary>
+        /// <param name="predicate">判断集合</param>
+        /// <param name="orderByType">排序方式</param>
+        /// <param name="pageIndex">当前页面索引</param>
+        /// <param name="pageSize">分布大小</param>
+        /// <param name="orderByExpression"></param>
+        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
+        /// <returns></returns>
+        public async Task<IPageList<CoreCmsUserTocashWeChatNotify>> QueryPageAsync(Expression<Func<CoreCmsUserTocashWeChatNotify, bool>> predicate,
+            Expression<Func<CoreCmsUserTocashWeChatNotify, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
+            int pageSize = 20, bool blUseNoLock = false)
+        {
+            return await _dal.QueryPageAsync(predicate, orderByExpression, orderByType, pageIndex, pageSize, blUseNoLock);
+        }
+
+        #endregion 重写根据条件查询分页数据
+    }
+}

CoreCms.Net.Services/User/CoreCmsUserTocashWeChatResponseServices.cs

@@ -0,0 +1,116 @@
+/***********************************************************************
+ *            Project: CoreCms
+ *        ProjectName: 核心内容管理系统
+ *                Web: https://www.corecms.net
+ *             Author: 大灰灰
+ *              Email: jianweie@163.com
+ *         CreateTime: 2025/7/23 16:37:18
+ *        Description: 暂无
+ ***********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using CoreCms.Net.Configuration;
+using CoreCms.Net.IRepository;
+using CoreCms.Net.IRepository.UnitOfWork;
+using CoreCms.Net.IServices;
+using CoreCms.Net.Model.Entities;
+using CoreCms.Net.Model.ViewModels.Basics;
+using CoreCms.Net.Model.ViewModels.UI;
+using SqlSugar;
+
+namespace CoreCms.Net.Services
+{
+    /// <summary>
+    /// 用户提现使用商家转账回调记录 接口实现
+    /// </summary>
+    public class CoreCmsUserTocashWeChatResponseServices : BaseServices<CoreCmsUserTocashWeChatResponse>, ICoreCmsUserTocashWeChatResponseServices
+    {
+        private readonly ICoreCmsUserTocashWeChatResponseRepository _dal;
+        private readonly IUnitOfWork _unitOfWork;
+
+        public CoreCmsUserTocashWeChatResponseServices(IUnitOfWork unitOfWork, ICoreCmsUserTocashWeChatResponseRepository dal)
+        {
+            this._dal = dal;
+            base.BaseDal = dal;
+            _unitOfWork = unitOfWork;
+        }
+
+        #region 实现重写增删改查操作==========================================================
+
+        /// <summary>
+        /// 重写异步插入方法
+        /// </summary>
+        /// <param name="entity">实体数据</param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> InsertAsync(CoreCmsUserTocashWeChatResponse entity)
+        {
+            return await _dal.InsertAsync(entity);
+        }
+
+        /// <summary>
+        /// 重写异步更新方法方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> UpdateAsync(CoreCmsUserTocashWeChatResponse entity)
+        {
+            return await _dal.UpdateAsync(entity);
+        }
+
+        /// <summary>
+        /// 重写异步更新方法方法
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> UpdateAsync(List<CoreCmsUserTocashWeChatResponse> entity)
+        {
+            return await _dal.UpdateAsync(entity);
+        }
+
+        /// <summary>
+        /// 重写删除指定ID的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> DeleteByIdAsync(object id)
+        {
+            return await _dal.DeleteByIdAsync(id);
+        }
+
+        /// <summary>
+        /// 重写删除指定ID集合的数据(批量删除)
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        public async Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids)
+        {
+            return await _dal.DeleteByIdsAsync(ids);
+        }
+
+        #endregion 实现重写增删改查操作==========================================================
+
+        #region 重写根据条件查询分页数据
+
+        /// <summary>
+        ///     重写根据条件查询分页数据
+        /// </summary>
+        /// <param name="predicate">判断集合</param>
+        /// <param name="orderByType">排序方式</param>
+        /// <param name="pageIndex">当前页面索引</param>
+        /// <param name="pageSize">分布大小</param>
+        /// <param name="orderByExpression"></param>
+        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
+        /// <returns></returns>
+        public async Task<IPageList<CoreCmsUserTocashWeChatResponse>> QueryPageAsync(Expression<Func<CoreCmsUserTocashWeChatResponse, bool>> predicate,
+            Expression<Func<CoreCmsUserTocashWeChatResponse, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
+            int pageSize = 20, bool blUseNoLock = false)
+        {
+            return await _dal.QueryPageAsync(predicate, orderByExpression, orderByType, pageIndex, pageSize, blUseNoLock);
+        }
+
+        #endregion 重写根据条件查询分页数据
+    }
+}

CoreCms.Net.Services/WechatTenpay/WechatTenpayClientFactory.cs

@@ -0,0 +1,79 @@
+using System;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using CoreCms.Net.Configuration;
+using CoreCms.Net.IServices;
+using Microsoft.Extensions.Options;
+using SKIT.FlurlHttpClient.Wechat.TenpayV3;
+
+namespace CoreCms.Net.Services
+{
+    using SKIT.FlurlHttpClient.Wechat.TenpayV3.Settings;
+
+    /// <summary>
+    /// 微信支付链接管理器实现
+    /// </summary>
+    internal partial class WechatTenpayClientFactory : IWechatTenpayClientFactory
+    {
+        private readonly IHttpClientFactory _httpClientFactory;
+        private readonly IWeChatPayConfigServices _weChatPayConfigServices;
+        private readonly ICoreCmsWeChatPayPlatformCertificateServices _weChatPayPlatformCertificateServices;
+
+
+        public WechatTenpayClientFactory(IHttpClientFactory httpClientFactory, IWeChatPayConfigServices weChatPayConfigServices, ICoreCmsWeChatPayPlatformCertificateServices weChatPayPlatformCertificateServices)
+        {
+            _httpClientFactory = httpClientFactory;
+            _weChatPayConfigServices = weChatPayConfigServices;
+            _weChatPayPlatformCertificateServices = weChatPayPlatformCertificateServices;
+        }
+
+        public async Task<WechatTenpayClient> Create(string merchantId)
+        {
+            var tenpayMerchantOptions = await _weChatPayConfigServices.QueryByClauseAsync(p => p.mchId == merchantId && p.isDefault == true && p.isEnable == true);
+
+            if (tenpayMerchantOptions == null)
+            {
+                throw new Exception("未在配置项中找到该 MerchantId 对应的微信商户号。");
+            }
+
+            var wechatTenpayClientOptions = new WechatTenpayClientOptions()
+            {
+                MerchantId = tenpayMerchantOptions.mchId,
+                MerchantV3Secret = tenpayMerchantOptions.apiV3Key,
+                MerchantCertificateSerialNumber = tenpayMerchantOptions.certificateSerialNumber,
+                MerchantCertificatePrivateKey = tenpayMerchantOptions.certificatePrivateKey,
+                AutoEncryptRequestSensitiveProperty = true,
+                AutoDecryptResponseSensitiveProperty = false,
+            };
+
+            // 基于平台证书的认证方式还需设置以下参数：
+            if (tenpayMerchantOptions.payType == (int)GlobalEnumVars.WeChatPayIdentityVerificationMethods.PlatformCertificate)
+            {
+                wechatTenpayClientOptions.PlatformAuthScheme = PlatformAuthScheme.Certificate;
+
+                var certificate = await _weChatPayPlatformCertificateServices.QueryByClauseAsync(p => p.merchantId == tenpayMerchantOptions.mchId);
+                if (certificate != null)
+                {
+                    var entity = new CertificateEntry(certificate.algorithmType, certificate.serialNumber, certificate.certificate, certificate.effectiveTime, certificate.expireTime);
+
+                    wechatTenpayClientOptions.PlatformCertificateManager.AddEntry(entity);
+                }
+            }
+            // 基于平台公钥的认证方式还需设置以下参数：
+            if (tenpayMerchantOptions.payType == (int)GlobalEnumVars.WeChatPayIdentityVerificationMethods.PlatformPublicKey)
+            {
+                wechatTenpayClientOptions.PlatformAuthScheme = PlatformAuthScheme.PublicKey;
+                wechatTenpayClientOptions.PlatformPublicKeyManager.AddEntry(
+                    new PublicKeyEntry(
+                        PublicKeyEntry.ALGORITHM_TYPE_RSA,
+                        tenpayMerchantOptions.platformPublicKeyId!,
+                        tenpayMerchantOptions.platformPublicKey!)
+                    );
+            }
+
+            var wechatTenpayClient = WechatTenpayClientBuilder.Create(wechatTenpayClientOptions).Build();
+            return wechatTenpayClient;
+        }
+    }
+}

CoreCms.Net.Task/AutoRefreshPlatformCertificateJob.cs

@@ -0,0 +1,137 @@
+/***********************************************************************
+ *            Project: CoreCms.Net                                     *
+ *                Web: https://CoreCms.Net                             *
+ *        ProjectName: 核心内容管理系统                                *
+ *             Author: 大灰灰                                          *
+ *              Email: JianWeie@163.com                                *
+ *         CreateTime: 2020-08-25 1:25:29
+ *        Description: 暂无
+ ***********************************************************************/
+
+
+using CoreCms.Net.IServices;
+using CoreCms.Net.Model.Entities;
+using Newtonsoft.Json;
+using System;
+using SKIT.FlurlHttpClient.Wechat.TenpayV3;
+using SKIT.FlurlHttpClient.Wechat.TenpayV3.Settings;
+using SKIT.FlurlHttpClient.Wechat.TenpayV3.Models;
+
+namespace CoreCms.Net.Task
+{
+    /// <summary>
+    /// 定时更新微信支付平台证书
+    /// </summary>
+    public class AutoRefreshPlatformCertificateJob
+    {
+
+        private readonly IWeChatPayConfigServices _weChatPayConfigServices;
+        private readonly IWechatTenpayClientFactory _wechatTenpayClientFactory;
+        private readonly ICoreCmsWeChatPayPlatformCertificateServices _weChatPayPlatformCertificateServices;
+        private readonly ISysTaskLogServices _taskLogServices;
+
+        /// <summary>
+        /// 构造函数
+        /// </summary>
+        public AutoRefreshPlatformCertificateJob(IWeChatPayConfigServices weChatPayConfigServices, IWechatTenpayClientFactory wechatTenpayClientFactory, ICoreCmsWeChatPayPlatformCertificateServices weChatPayPlatformCertificateServices, ISysTaskLogServices taskLogServices)
+        {
+            _weChatPayConfigServices = weChatPayConfigServices;
+            _wechatTenpayClientFactory = wechatTenpayClientFactory;
+            _weChatPayPlatformCertificateServices = weChatPayPlatformCertificateServices;
+            _taskLogServices = taskLogServices;
+        }
+
+        public async System.Threading.Tasks.Task Execute()
+        {
+            var config = await _weChatPayConfigServices.QueryListByClauseAsync(p => p.isDefault == true && p.isEnable == true);
+            if (config != null)
+            {
+                foreach (var item in config)
+                {
+                    try
+                    {
+                        const string algorithmType = "RSA";
+                        var client = await _wechatTenpayClientFactory.Create(item.mchId);
+                        var request = new QueryCertificatesRequest() { AlgorithmType = algorithmType };
+                        var response = await client.ExecuteQueryCertificatesAsync(request);
+                        if (response.IsSuccessful())
+                        {
+                            // NOTICE:
+                            //   如果构造 Client 时启用了 `AutoDecryptResponseSensitiveProperty` 配置项，则无需再执行下面一行的手动解密方法：
+                            response = client.DecryptResponseSensitiveProperty(response);
+
+                            foreach (var certificate in response.CertificateList)
+                            {
+                                var entity = CertificateEntry.Parse(algorithmType, certificate);
+
+                                // 将证书添加到平台证书管理器中
+                                var model = await _weChatPayPlatformCertificateServices.QueryByClauseAsync(p =>
+                                    p.merchantId == item.mchId);
+                                if (model != null)
+                                {
+                                    model.algorithmType = entity.AlgorithmType;
+                                    model.serialNumber = entity.SerialNumber;
+                                    model.certificate = entity.Certificate;
+                                    model.effectiveTime = entity.EffectiveTime.DateTime;
+                                    model.expireTime = entity.ExpireTime.DateTime;
+
+                                    model.updataTime = DateTime.Now;
+                                    await _weChatPayPlatformCertificateServices.UpdateAsync(model);
+                                }
+                                else
+                                {
+                                    model = new CoreCmsWeChatPayPlatformCertificate();
+                                    model.algorithmType = entity.AlgorithmType;
+                                    model.serialNumber = entity.SerialNumber;
+                                    model.certificate = entity.Certificate;
+                                    model.effectiveTime = entity.EffectiveTime.DateTime;
+                                    model.expireTime = entity.ExpireTime.DateTime;
+                                    model.merchantId = item.mchId;
+                                    model.createTime = DateTime.Now;
+                                    await _weChatPayPlatformCertificateServices.InsertAsync(model);
+                                }
+                                //client.PlatformCertificateManager.AddEntry(entity);
+                            }
+
+                            //插入日志
+                            var log = new SysTaskLog
+                            {
+                                createTime = DateTime.Now,
+                                isSuccess = true,
+                                name = "刷新微信商户平台证书成功",
+                                parameters = JsonConvert.SerializeObject(response)
+                            };
+                            await _taskLogServices.InsertAsync(log);
+
+                        }
+                        else
+                        {
+                            //插入日志
+                            var log = new SysTaskLog
+                            {
+                                createTime = DateTime.Now,
+                                isSuccess = true,
+                                name = "刷新微信商户平台证书失败",
+                                parameters = $"刷新微信商户平台证书失败（状态码：{response.GetRawStatus()}，错误代码：{response.ErrorCode}，错误描述：{response.ErrorMessage}）。",
+                            };
+                            await _taskLogServices.InsertAsync(log);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+
+                        //插入日志
+                        var log = new SysTaskLog
+                        {
+                            createTime = DateTime.Now,
+                            isSuccess = true,
+                            name = "刷新微信商户平台证书遇到异常",
+                            parameters = JsonConvert.SerializeObject(ex)
+                        };
+                        await _taskLogServices.InsertAsync(log);
+                    }
+                }
+            }
+        }
+    }
+}

CoreCms.Net.Task/HangfireDispose.cs

@@ -70,6 +70,9 @@ namespace CoreCms.Net.Task
             //自动取消服务器订单任务
             RecurringJob.AddOrUpdate<AutoCancelServiceOrderJob>("AutoCancelServiceOrderJob", s => s.Execute(), "0 0/5 * * * ? ", new RecurringJobOptions { TimeZone = TimeZoneInfo.Local }); // 每5分钟取消一次订单
 
+            //定时更新微信支付平台证书
+            RecurringJob.AddOrUpdate<AutoRefreshPlatformCertificateJob>("AutoRefreshPlatformCertificateJob", s => s.Execute(), "0 0 6 * * ? ", new RecurringJobOptions { TimeZone = TimeZoneInfo.Local }); // 每天凌晨6点执行，首次可以自主进入定时任务页面手动执行一次
+
 
         }
 

CoreCms.Net.Uni-App/CoreShop/core/enum/member.enum.ts

@@ -81,3 +81,16 @@ export enum ServiceCardStatusEnum {
 	/** 已核销 */
 	verified = 3,
 }
+
+export enum UserTocashType {
+    /** 银行线下转账 */
+    offlineBankTransfer = 0,
+    /** 企业付款到零钱 */
+    enterprisePaymentToChange = 1,
+    /** 企业付款到银行卡 */
+    enterprisePaymentTobankcard = 2,
+    /** 商家转账到零钱 */
+    merchantsTransferMoneyToChange = 3,
+    /** 商家转账 */
+    merchantTransfer = 4,
+}

CoreCms.Net.Uni-App/CoreShop/core/models/balance.ts

@@ -47,4 +47,5 @@ export interface CashType {
 	userId ?: number;
 	userNickName ?: string;
 	withdrawals ?: number;
+    needUserGet?:boolean;
 }

CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/balance/withdraw-detail/index.scss

@@ -57,6 +57,13 @@
 			.date {
 				margin-top: 10rpx;
 			}
+            .btn{
+                padding: 10rpx 20rpx;
+                font-size: 27rpx;
+                color: #fff;
+                background-color: #d33123;
+                border-radius: 10rpx;
+            }
 		}
 	}
 }

CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/balance/withdraw-detail/index.vue

@@ -1,115 +1,174 @@
 <template>
-	<coreshop-page title="提现明细" mode="left">
+    <coreshop-page title="提现明细" mode="left">
-		<view class="box">
+        <view class="box">
-			<view class="select-box" :style="{'top':`${statusBarHeight}px`}" @click="onSelectFilterType">
+            <view class="select-box" :style="{'top':`${statusBarHeight}px`}" @click="onSelectFilterType">
-				<view class="name">筛选类型:</view>
+                <view class="name">筛选类型:</view>
-				<view class="selected">
+                <view class="selected">
-					<text class="tit">{{state.selectFilterType}}</text>
+                    <text class="tit">{{state.selectFilterType}}</text>
-					<uv-icon name="arrow-down"></uv-icon>
+                    <uv-icon name="arrow-down"></uv-icon>
-				</view>
+                </view>
-			</view>
+            </view>
 
-			<uv-picker ref="balanceFilterTypePickerRef" confirmColor="#D33123" :columns="state.balanceFilterTypes"
+            <uv-picker ref="balanceFilterTypePickerRef" confirmColor="#D33123" :columns="state.balanceFilterTypes"
-				@confirm="onConfirm"></uv-picker>
+                @confirm="onConfirm"></uv-picker>
 
-			<view class="list" v-if="state.list.length > 0">
+            <view class="list" v-if="state.list.length > 0">
-				<view class="item" v-for="item in state.list" :key="item.id">
+                <view class="item" v-for="item in state.list" :key="item.id">
-					<view class="header">
+                    <view class="header">
-						<view class="type">{{item.statusName}}</view>
+                        <view class="type">{{item.statusName}}</view>
-						<view class="remain">提现金额￥{{item.money}}</view>
+                        <view class="remain">提现金额￥{{item.money}}</view>
-					</view>
+                    </view>
-					<view class="withdraw_box">
+                    <view class="withdraw_box">
-						<view class="withdraw">
+                        <view class="withdraw">
-							<view class="money">提现卡号</view>
+                            <view class="money">提现卡号</view>
-							<view class="date">{{item.cardNumber}}</view>
+                            <view class="date">{{item.cardNumber}}</view>
-						</view>
+                        </view>
-						<view class="date">
+                        <view class="date">
-							<view class="money">提现时间</view>
+                            <view class="money">提现时间</view>
-							<view class="date">{{item.createTime}}</view>
+                            <view class="date">{{item.createTime}}</view>
-						</view>
+                        </view>
-					</view>
+                        <view class="date">
-				</view>
+                            <view class="money">提现方式</view>
-				<view class="no-data" v-if="state.page === state.totalPages">没有更多了</view>
+                            <view class="date">
-			</view>
+                                {{ getUserTocashType(item.type) }}
-			<view v-else class="layout-empty-box">
+                            </view>
-				<coreshop-empty :mode="EmptyEnum.history" text="暂无数据"></coreshop-empty>
+                        </view>
-			</view>
+                        <view class="date" v-if="item.needUserGet && item.type == UserTocashType.merchantTransfer">
+                            <view>
+                                <!-- 您已领取到微信余额 -->
+                            </view>
+                            <view class="btn" @click="handlerReceiveWeChat(item)">领取到微信零钱</view>
+                        </view>
+                    </view>
+                </view>
+                <view class="no-data" v-if="state.page === state.totalPages">没有更多了</view>
+            </view>
+            <view v-else class="layout-empty-box">
+                <coreshop-empty :mode="EmptyEnum.history" text="暂无数据"></coreshop-empty>
+            </view>
 
-		</view>
+        </view>
-	</coreshop-page>
+    </coreshop-page>
 
 </template>
 
 <script setup lang="ts">
-	import { reactive, ref } from "vue";
+    import { reactive, ref } from "vue";
-	import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+    import { onLoad, onReachBottom } from '@dcloudio/uni-app';
-	import { queryCashList } from '@/core/api';
+    import { queryCashList } from '@/core/api';
-	import type { Response, CashType } from '@/core/models';
+    import type { Response, CashType } from '@/core/models';
-	import { handleShowToast } from '@/core/utils';
+    import { handleShowToast } from '@/core/utils';
-	import { EmptyEnum } from '@/core/enum';
+    import { EmptyEnum, UserTocashType } from '@/core/enum';
-	import { useSystemInfo } from '@/core/hooks';
+    import { useSystemInfo } from '@/core/hooks';
 
-	// 获取自定义导航栏高度
+    // 获取自定义导航栏高度
-	const { statusBarHeight } = useSystemInfo();
+    const { statusBarHeight } = useSystemInfo();
 
-	const balanceFilterTypePickerRef = ref();
+    const balanceFilterTypePickerRef = ref();
 
-	const state = reactive<{
+    const state = reactive<{
-		balanceFilterTypes : Array<Array<string>>;
+        balanceFilterTypes : Array<Array<string>>;
-		selectFilterType : string;
+        selectFilterType : string;
-		id : number;
+        id : number;
-		page : number;
+        page : number;
-		limit : number;
+        limit : number;
-		list : Array<CashType>;
+        list : Array<CashType>;
-		totalPages : number;
+        totalPages : number;
-	}>({
+    }>({
-		balanceFilterTypes: [['全部', '待审核', '提现成功', '提现失败']],
+        balanceFilterTypes: [['全部', '待审核', '提现成功', '提现失败']],
-		selectFilterType: '全部',
+        selectFilterType: '全部',
-		id: 0,
+        id: 0,
-		page: 1,
+        page: 1,
-		limit: 10,
+        limit: 10,
-		list: [],
+        list: [],
-		totalPages: 1,
+        totalPages: 1,
-	})
+    })
 
-	onLoad(() => {
+    onLoad(() => { 
-		getCashList();
+        getCashList();
-	});
+    });
 
-	onReachBottom(() => {
+    onReachBottom(() => {
-		if (state.totalPages > state.page) {
+        if (state.totalPages > state.page) {
-			state.page++;
+            state.page++;
-			getCashList();
+            getCashList();
-		}
+        }
-	});
+    });
 
-	/** 用户提现列表 */
+    /** 用户提现列表 */
-	const getCashList = async () => {
+    const getCashList = async () => {
-		const cashList : Response<Array<CashType>> = await queryCashList({
+        const cashList : Response<Array<CashType>> = await queryCashList({
-			id: state.id,
+            id: state.id,
-			page: state.page,
+            page: state.page,
-			limit: state.limit,
+            limit: state.limit,
-		});
+        });
-		if (cashList.status) {
+        if (cashList.status) {
-			state.totalPages = cashList?.otherData?.totalPages;
+            state.totalPages = cashList?.otherData?.totalPages;
-			state.list = state.list.concat(cashList.data);
+            state.list = state.list.concat(cashList.data);
-		} else {
+        } else {
-			handleShowToast(cashList.msg)
+            handleShowToast(cashList.msg)
-		}
+        }
-	}
+    }
 
-	const onSelectFilterType = () => {
+    const onSelectFilterType = () => {
-		balanceFilterTypePickerRef.value?.open();
+        balanceFilterTypePickerRef.value?.open();
-	}
+    }
-	const onConfirm = ({ indexs, value }) => {
+    const onConfirm = ({ indexs, value }) => {
-		state.id = indexs[0];
+        state.id = indexs[0];
-		state.selectFilterType = value?.[0];
+        state.selectFilterType = value?.[0];
-		state.list = [];
+        state.list = [];
-		state.page = 1;
+        state.page = 1;
-		getCashList();
+        getCashList();
-	}
+    }
+
+    /* 提现方式 */
+    const getUserTocashType = (type : number) => {
+        switch (type) {
+            case UserTocashType.offlineBankTransfer:
+                return '银行线下转账';
+            case UserTocashType.enterprisePaymentToChange:
+                return '企业付款到零钱';
+            case UserTocashType.enterprisePaymentTobankcard:
+                return '企业付款到银行卡';
+            case UserTocashType.merchantsTransferMoneyToChange:
+                return '商家转账到零钱';
+            case UserTocashType.merchantTransfer:
+                return '商家转账';
+            default:
+                break;
+        }
+    }
+
+    const handlerReceiveWeChat = (item:any) => {
+        // #ifdef  MP-WEIXIN  
+        let message = JSON.parse(item.message);
+        if(message.response.state != 'WAIT_USER_CONFIRM'){
+            return ;
+        } 
+        if (wx.canIUse('requestMerchantTransfer')) {
+            wx.requestMerchantTransfer({
+                mchId: item.merchantTransferData.mchId,
+                appId: item.merchantTransferData.appId,
+                package: message.response.package_info,
+                success: () => {
+                    state.page = 1;
+                    state.list = [];
+                    getCashList();
+                },
+                fail: (res) => {
+                    console.log('fail:', res);
+                },
+            });
+        } else {
+            wx.showModal({
+                content: '你的微信版本过低，请更新至最新版本。',
+                showCancel: false,
+            });
+        }
+        // #endif
+    }
 </script>
 
 <style scoped lang="scss">
-	@import './index.scss';
+    @import './index.scss';
 </style>

CoreCms.Net.WeChat.Service/CoreCms.Net.WeChat.Service.csproj

@@ -10,6 +10,7 @@
     <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.6.0" />
+    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.13.0" />
   </ItemGroup>
 
   <ItemGroup>

CoreCms.Net.Web.Admin/Controllers/Pay/CoreCmsWeChatPayConfigController.cs

@@ -229,9 +229,11 @@ namespace CoreCms.Net.Web.Admin.Controllers
             var jm = new AdminUiCallBack { code = 0 };
 
             var weiChatPayTradeType = EnumHelper.EnumToList<WeiChatPayTradeType>();
+            var weChatPayIdentityVerificationMethods = EnumHelper.EnumToList<WeChatPayIdentityVerificationMethods>();
             jm.data = new
             {
-                weiChatPayTradeType
+                weiChatPayTradeType,
+                weChatPayIdentityVerificationMethods
             };
 
             return jm;
@@ -252,9 +254,12 @@ namespace CoreCms.Net.Web.Admin.Controllers
             var jm = new AdminUiCallBack { code = 0 };
 
             var weiChatPayTradeType = EnumHelper.EnumToList<WeiChatPayTradeType>();
+            var weChatPayIdentityVerificationMethods = EnumHelper.EnumToList<WeChatPayIdentityVerificationMethods>();
+
             jm.data = new
             {
-                weiChatPayTradeType
+                weiChatPayTradeType,
+                weChatPayIdentityVerificationMethods
             };
 
             return jm;
@@ -299,10 +304,13 @@ namespace CoreCms.Net.Web.Admin.Controllers
             jm.code = 0;
 
             var weiChatPayTradeType = EnumHelper.EnumToList<WeiChatPayTradeType>();
+            var weChatPayIdentityVerificationMethods = EnumHelper.EnumToList<WeChatPayIdentityVerificationMethods>();
+
             jm.data = new
             {
                 model,
-                weiChatPayTradeType
+                weiChatPayTradeType,
+                weChatPayIdentityVerificationMethods
             };
 
             return jm;

CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserTocashController.cs

@@ -8,12 +8,6 @@
  *        Description: 暂无
  ***********************************************************************/
 
-using System;
-using System.ComponentModel;
-using System.IO;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Threading.Tasks;
 using CoreCms.Net.Configuration;
 using CoreCms.Net.Filter;
 using CoreCms.Net.IServices;
@@ -22,6 +16,7 @@ using CoreCms.Net.Model.Entities;
 using CoreCms.Net.Model.Entities.Expression;
 using CoreCms.Net.Model.FromBody;
 using CoreCms.Net.Model.ViewModels.UI;
+using CoreCms.Net.Services;
 using CoreCms.Net.Utility.Extensions;
 using CoreCms.Net.Utility.Helper;
 using CoreCms.Net.Web.Admin.Infrastructure;
@@ -30,6 +25,12 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using NPOI.HSSF.UserModel;
 using SqlSugar;
+using System;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
 
 namespace CoreCms.Net.Web.Admin.Controllers
 {
@@ -60,10 +61,9 @@ namespace CoreCms.Net.Web.Admin.Controllers
         }
 
         #region 获取列表============================================================
-
         // POST: Api/CoreCmsUserTocash/GetPageList
         /// <summary>
-        ///     获取列表
+        /// 获取列表
         /// </summary>
         /// <returns></returns>
         [HttpPost]
@@ -76,52 +76,27 @@ namespace CoreCms.Net.Web.Admin.Controllers
             var where = PredicateBuilder.True<CoreCmsUserTocash>();
             //获取排序字段
             var orderField = Request.Form["orderField"].FirstOrDefault();
-            Expression<Func<CoreCmsUserTocash, object>> orderEx;
+
-            switch (orderField)
+            Expression<Func<CoreCmsUserTocash, object>> orderEx = orderField switch
             {
-                case "id":
+                "id" => p => p.id,
-                    orderEx = p => p.id;
+                "userId" => p => p.userId,
-                    break;
+                "money" => p => p.money,
-                case "userId":
+                "bankName" => p => p.bankName,
-                    orderEx = p => p.userId;
+                "bankCode" => p => p.bankCode,
-                    break;
+                "bankAreaId" => p => p.bankAreaId,
-                case "money":
+                "accountBank" => p => p.accountBank,
-                    orderEx = p => p.money;
+                "accountName" => p => p.accountName,
-                    break;
+                "cardNumber" => p => p.cardNumber,
-                case "bankName":
+                "withdrawals" => p => p.withdrawals,
-                    orderEx = p => p.bankName;
+                "status" => p => p.status,
-                    break;
+                "createTime" => p => p.createTime,
-                case "bankCode":
+                "updateTime" => p => p.updateTime,
-                    orderEx = p => p.bankCode;
+                "type" => p => p.type,
-                    break;
+                "message" => p => p.message,
-                case "bankAreaId":
+                "needUserGet" => p => p.needUserGet,
-                    orderEx = p => p.bankAreaId;
+                _ => p => p.id
-                    break;
+            };
-                case "accountBank":
-                    orderEx = p => p.accountBank;
-                    break;
-                case "accountName":
-                    orderEx = p => p.accountName;
-                    break;
-                case "cardNumber":
-                    orderEx = p => p.cardNumber;
-                    break;
-                case "withdrawals":
-                    orderEx = p => p.withdrawals;
-                    break;
-                case "status":
-                    orderEx = p => p.status;
-                    break;
-                case "createTime":
-                    orderEx = p => p.createTime;
-                    break;
-                case "updateTime":
-                    orderEx = p => p.updateTime;
-                    break;
-                default:
-                    orderEx = p => p.id;
-                    break;
-            }
 
             //设置排序方式
             var orderDirection = Request.Form["orderDirection"].FirstOrDefault();
@@ -133,34 +108,72 @@ namespace CoreCms.Net.Web.Admin.Controllers
             };
             //查询筛选
 
-            //ID号 int
+            //id int
             var id = Request.Form["id"].FirstOrDefault().ObjectToInt(0);
-            if (id > 0) @where = @where.And(p => p.id == id);
+            if (id > 0)
+            {
+                where = where.And(p => p.id == id);
+            }
             //用户ID int
             var userId = Request.Form["userId"].FirstOrDefault().ObjectToInt(0);
-            if (userId > 0) @where = @where.And(p => p.userId == userId);
+            if (userId > 0)
-
+            {
+                where = where.And(p => p.userId == userId);
+            }
+            //提现金额 decimal
+            var money = Request.Form["money"].FirstOrDefault().ObjectToDecimal(0);
+            if (money > 0)
+            {
+                where = where.And(p => p.money == money);
+            }
             //银行名称 nvarchar
             var bankName = Request.Form["bankName"].FirstOrDefault();
-            if (!string.IsNullOrEmpty(bankName)) @where = @where.And(p => p.bankName.Contains(bankName));
+            if (!string.IsNullOrEmpty(bankName))
+            {
+                where = where.And(p => p.bankName.Contains(bankName));
+            }
             //银行缩写 nvarchar
             var bankCode = Request.Form["bankCode"].FirstOrDefault();
-            if (!string.IsNullOrEmpty(bankCode)) @where = @where.And(p => p.bankCode.Contains(bankCode));
+            if (!string.IsNullOrEmpty(bankCode))
+            {
+                where = where.And(p => p.bankCode.Contains(bankCode));
+            }
             //账号地区ID int
             var bankAreaId = Request.Form["bankAreaId"].FirstOrDefault().ObjectToInt(0);
-            if (bankAreaId > 0) @where = @where.And(p => p.bankAreaId == bankAreaId);
+            if (bankAreaId > 0)
+            {
+                where = where.And(p => p.bankAreaId == bankAreaId);
+            }
             //开户行 nvarchar
             var accountBank = Request.Form["accountBank"].FirstOrDefault();
-            if (!string.IsNullOrEmpty(accountBank)) @where = @where.And(p => p.accountBank.Contains(accountBank));
+            if (!string.IsNullOrEmpty(accountBank))
+            {
+                where = where.And(p => p.accountBank.Contains(accountBank));
+            }
             //账户名 nvarchar
             var accountName = Request.Form["accountName"].FirstOrDefault();
-            if (!string.IsNullOrEmpty(accountName)) @where = @where.And(p => p.accountName.Contains(accountName));
+            if (!string.IsNullOrEmpty(accountName))
+            {
+                where = where.And(p => p.accountName.Contains(accountName));
+            }
             //卡号 nvarchar
             var cardNumber = Request.Form["cardNumber"].FirstOrDefault();
-            if (!string.IsNullOrEmpty(cardNumber)) @where = @where.And(p => p.cardNumber.Contains(cardNumber));
+            if (!string.IsNullOrEmpty(cardNumber))
+            {
+                where = where.And(p => p.cardNumber.Contains(cardNumber));
+            }
+            //提现服务费 decimal
+            var withdrawals = Request.Form["withdrawals"].FirstOrDefault().ObjectToDecimal(0);
+            if (withdrawals > 0)
+            {
+                where = where.And(p => p.withdrawals == withdrawals);
+            }
             //提现状态 int
             var status = Request.Form["status"].FirstOrDefault().ObjectToInt(0);
-            if (status > 0) @where = @where.And(p => p.status == status);
+            if (status > 0)
+            {
+                where = where.And(p => p.status == status);
+            }
             //创建时间 datetime
             var createTime = Request.Form["createTime"].FirstOrDefault();
             if (!string.IsNullOrEmpty(createTime))
@@ -179,7 +192,6 @@ namespace CoreCms.Net.Web.Admin.Controllers
                     where = where.And(p => p.createTime > dt);
                 }
             }
-
             //更新时间 datetime
             var updateTime = Request.Form["updateTime"].FirstOrDefault();
             if (!string.IsNullOrEmpty(updateTime))
@@ -198,10 +210,28 @@ namespace CoreCms.Net.Web.Admin.Controllers
                     where = where.And(p => p.updateTime > dt);
                 }
             }
-            //提现状态 int
+            //提现方式 int
             var type = Request.Form["type"].FirstOrDefault().ObjectToInt(0);
-            if (type > 0) @where = @where.And(p => p.type == type);
+            if (type > 0)
-
+            {
+                where = where.And(p => p.type == type);
+            }
+            //反馈结果 nvarchar
+            var message = Request.Form["message"].FirstOrDefault();
+            if (!string.IsNullOrEmpty(message))
+            {
+                where = where.And(p => p.message.Contains(message));
+            }
+            //需要用户领取 bit
+            var needUserGet = Request.Form["needUserGet"].FirstOrDefault();
+            if (!string.IsNullOrEmpty(needUserGet) && needUserGet.ToLowerInvariant() == "true")
+            {
+                where = where.And(p => p.needUserGet == true);
+            }
+            else if (!string.IsNullOrEmpty(needUserGet) && needUserGet.ToLowerInvariant() == "false")
+            {
+                where = where.And(p => p.needUserGet == false);
+            }
             //获取数据
             var list = await _coreCmsUserTocashServices.QueryPageAsync(where, orderEx, orderBy, pageCurrent, pageSize, true);
             //返回数据
@@ -211,9 +241,9 @@ namespace CoreCms.Net.Web.Admin.Controllers
             jm.msg = "数据调用成功!";
             return jm;
         }
-
         #endregion
 
+
         #region 首页数据============================================================
 
         // POST: Api/CoreCmsUserTocash/GetIndex
@@ -276,7 +306,6 @@ namespace CoreCms.Net.Web.Admin.Controllers
         }
         #endregion
 
-
         #region 设置状态============================================================
 
         // POST: Api/CoreCmsUser/DoSetisDelete/10
@@ -308,8 +337,6 @@ namespace CoreCms.Net.Web.Admin.Controllers
 
         #endregion
 
-
-
         #region 预览数据============================================================
         // POST: Api/CoreCmsUserTocash/GetDetails/10
         /// <summary>
@@ -345,7 +372,6 @@ namespace CoreCms.Net.Web.Admin.Controllers
         }
         #endregion
 
-
         #region 选择导出============================================================
 
         // POST: Api/CoreCmsUserTocash/SelectExportExcel/10

CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml

@@ -5657,7 +5657,7 @@
         </member>
         <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserTocashController.GetPageList">
             <summary>
-                获取列表
+            获取列表
             </summary>
             <returns></returns>
         </member>

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

@@ -69,6 +69,15 @@
                     <input type="text" name="createTime" id="searchTime-CoreCmsUserTocash-createTime" placeholder="请输入起止时间" class="layui-input">
                 </div>
             </div>
+            <div class="layui-inline">
+                <div class="layui-input-inline">
+                    <select name="needUserGet">
+                        <option value="">请选择需要用户领取</option>
+                        <option value="True">是</option>
+                        <option value="False">否</option>
+                    </select>
+                </div>
+            </div>
             <div class="layui-inline">
                 <button class="layui-btn layui-btn-sm" lay-submit lay-filter="LAY-app-CoreCmsUserTocash-search"><i class="layui-icon layui-icon-search"></i>筛选</button>
                 <button class="layui-btn layui-btn-sm layui-btn-primary" lay-submit lay-filter="LAY-app-CoreCmsUserTocash-clearSearch"><i class="layui-icon layui-icon-delete"></i>清除</button>
@@ -185,6 +194,7 @@
                             },
                             { field: 'createTime', title: '创建时间', width: 130, sort: false },
                             { field: 'updateTime', title: '更新时间', width: 130, sort: false },
+                            { field: 'needUserGet', title: '等待用户领取', width: 95, templet: '#switch_needUserGet', sort: false, unresize: true },
                             { width: 120, align: 'center', title: '操作', fixed: 'right', toolbar: '#LAY-app-CoreCmsUserTocash-tableBox-bar' },
                             { field: 'message', title: '反馈信息', sort: false },
                         ]
@@ -333,6 +343,28 @@
                     type: 'datetime',
                     range: '到',
                 });
+
+
+                //监听 表格复选框操作
+
+                layui.form.on('switch(switch_needUserGet)', function (obj) {
+                    coreHelper.Post("Api/CoreCmsUserTocash/DoSetneedUserGet", { id: this.value, data: obj.elem.checked }, function (e) {
+                        if (debug) { console.log(e); } //开启调试返回数据
+                        //table.reloadData('LAY-app-CoreCmsUserTocash-tableBox');
+                        layer.msg(e.msg);
+                    });
+                });
+
+
+                //重载form
+                form.render();
+
             });
     };
 </script>
+
+
+<!--设置需要用户领取-->
+<script type="text/html" id="switch_needUserGet">
+    <input type="checkbox" name="switch_needUserGet" value="{{d.id}}" disabled="disabled" lay-skin="switch" lay-text="是否" lay-filter="switch_needUserGet" {{ d.needUserGet ? 'checked' : '' }}>
+</script>

CoreCms.Net.Web.Admin/wwwroot/views/shop/pay/wechatpayconfig/create.html

@@ -1,128 +1,221 @@
 <script type="text/html" template lay-done="layui.data.done(d);">
     <div class="layui-form coreshop-form layui-form-pane" lay-filter="LAY-app-CoreCmsWeChatPayConfig-createForm" id="LAY-app-CoreCmsWeChatPayConfig-createForm">
 
+        <div class="layui-tab" lay-filter="test-handle" lay-allowclose="true">
+            <ul class="layui-tab-title">
+                <li class="layui-this" lay-id="11">基础设置</li>
+                <li lay-id="22">证书密钥配置</li>
+            </ul>
+            <div class="layui-tab-content">
+                <div class="layui-tab-item layui-show">
 
-        <div class="layui-form-item">
+                    <div class="layui-form-item">
-            <label for="appType" class="layui-form-label  layui-form-required">应用类型</label>
+                        <label for="appType" class="layui-form-label  layui-form-required">应用类型</label>
-            <div class="layui-input-inline layui-inline-5">
+                        <div class="layui-input-inline layui-inline-5">
-                <select name="appType" lay-verify="required" placeholder="请输入应用类型" lay-reqText="请输入应用类型">
+                            <select name="appType" lay-verify="required" placeholder="请输入应用类型" lay-reqText="请输入应用类型">
-                    <option value="">请选择所属应用类型</option>
+                                <option value="">请选择所属应用类型</option>
-                    {{# layui.each(d.params.data.weiChatPayTradeType, function(index, item){ }}
+                                {{# layui.each(d.params.data.weiChatPayTradeType, function(index, item){ }}
-                    <option value="{{ item.title }}">{{ item.description }}</option>
+                                <option value="{{ item.title }}">{{ item.description }}</option>
-                    {{# }); }}
+                                {{# }); }}
-                </select>
+                            </select>
-            </div>
+                        </div>
-            <label for="appId" class="layui-form-label  layui-form-required">应用AppID</label>
+                        <label for="appId" class="layui-form-label  layui-form-required">应用AppID</label>
-            <div class="layui-input-inline layui-inline-5">
+                        <div class="layui-input-inline layui-inline-5">
-                <input name="appId" lay-verify="required" class="layui-input" placeholder="请输入应用号" lay-reqText="请输入应用号" />
+                            <input name="appId" lay-verify="required" class="layui-input" placeholder="请输入应用号" lay-reqText="请输入应用号" />
-            </div>
+                        </div>
-            <label for="mchId" class="layui-form-label  layui-form-required">商户号</label>
+                        <label for="mchId" class="layui-form-label  layui-form-required">商户号</label>
-            <div class="layui-input-inline layui-inline-5">
+                        <div class="layui-input-inline layui-inline-5">
-                <input name="mchId" lay-verify="required" class="layui-input" placeholder="请输入商户号" lay-reqText="请输入商户号" />
+                            <input name="mchId" lay-verify="required" class="layui-input" placeholder="请输入商户号" lay-reqText="请输入商户号" />
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <label for="subAppId" class="layui-form-label">子商户应用号</label>
+                        <div class="layui-input-inline layui-inline-4">
+                            <input name="subAppId" class="layui-input" placeholder="请输入子商户应用号" lay-reqText="请输入子商户应用号" />
+                        </div>
+                        <div class="layui-form-mid">
+                            目前仅调用服务商API时使用，子商户的公众号、移动应用AppId。
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <label for="subMchId" class="layui-form-label">子商户号</label>
+                        <div class="layui-input-inline layui-inline-4">
+                            <input name="subMchId" class="layui-input" placeholder="请输入子商户号" lay-reqText="请输入子商户号" />
+                        </div>
+                        <div class="layui-form-mid">
+                            目前仅调用服务商API时使用，子商户的商户号。
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <label for="notifyUrl" class="layui-form-label layui-form-required">支付回调通知</label>
+                        <div class="layui-input-inline layui-inline-10">
+                            <input name="notifyUrl" lay-verify="required" class="layui-input" placeholder="请输入支付回调通知" lay-reqText="请输入支付回调通知" value="https://api.pro.demo.coreshop.cn/Notify/WeChatPay/Unifiedorder" />
+                        </div>
+                        <div class="layui-form-mid">
+                            webApi端接口地址+【/Notify/WeChatPay/Unifiedorder】
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <label for="refundUrl" class="layui-form-label  layui-form-required">退款回调</label>
+                        <div class="layui-input-inline layui-inline-10">
+                            <input name="refundUrl" lay-verify="required" class="layui-input" placeholder="请输入退款回调" lay-reqText="请输入退款回调" value="https://api.pro.demo.coreshop.cn/Notify/WeChatPay/Refund" />
+                        </div>
+                        <div class="layui-form-mid">
+                            webApi端接口地址+【/Notify/WeChatPay/Refund】
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <label for="refundUrl" class="layui-form-label  layui-form-required">提现回调通知</label>
+                        <div class="layui-input-inline layui-inline-10">
+                            <input name="transferBillsUrl" lay-verify="required" class="layui-input" placeholder="请输入提现回调通知" lay-reqText="请输入提现回调通知" value="https://api.pro.demo.coreshop.cn/Notify/WeChatPay/TransferBillsCallBack" />
+                        </div>
+                        <div class="layui-form-mid">
+                            webApi端接口地址+【/Notify/WeChatPay/TransferBillsCallBack】
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <label for="jumpUrl" class="layui-form-label">跳转地址</label>
+                        <div class="layui-input-inline layui-inline-8">
+                            <input name="jumpUrl" class="layui-input" placeholder="请输入跳转地址" lay-reqText="请输入跳转地址" />
+                        </div>
+                        <div class="layui-form-mid">
+                            H5，PC端支付成功或者支付失败后跳转的查询支付状态的地址。（默认可不填写）
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <label for="isEnable" class="layui-form-label  layui-form-required">是否开启</label>
+                        <div class="layui-input-inline layui-inline-4">
+                            <input type="checkbox" lay-filter="switch" name="isEnable" lay-skin="switch" lay-text="开启|关闭">
+                        </div>
+                        <label for="isDefault" class="layui-form-label  layui-form-required">是否本类默认</label>
+                        <div class="layui-input-inline layui-inline-4">
+                            <input type="checkbox" lay-filter="switch" name="isDefault" lay-skin="switch" lay-text="开启|关闭">
+                        </div>
+                    </div>
+
+                </div>
+                <div class="layui-tab-item">
+
+                    <div class="layui-form-item">
+                        <label for="rsaPublicKey" class="layui-form-label">RSA公钥（弃用）</label>
+                        <div class="layui-input-inline layui-inline-8">
+                            <input name="rsaPublicKey" class="layui-input" placeholder="请输入RSA公钥" lay-reqText="请输入RSA公钥" />
+                        </div>
+                        <div class="layui-form-mid">
+                            目前仅"企业付款到银行卡API"使用，调用"获取RSA加密公钥API"即可获取
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <label for="apiKey" class="layui-form-label  layui-form-required">APIv2密钥</label>
+                        <div class="layui-input-inline layui-inline-12">
+                            <input name="apiKey" lay-verify="required" class="layui-input" placeholder="请输入API秘钥" lay-reqText="请输入API秘钥" />
+                        </div>
+                        <div class="layui-form-mid">
+                            apiV2密钥
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <label for="apiV3Key" class="layui-form-label">APIv3密钥</label>
+                        <div class="layui-input-inline layui-inline-12">
+                            <input name="apiV3Key" class="layui-input" placeholder="请输入APIv3密钥" lay-reqText="请输入APIv3密钥" />
+                        </div>
+                        <div class="layui-form-mid">
+                            只有开启了商家付款到零钱的功能才需要录入APIv3密钥（用于提现）
+                        </div>
+                    </div>
+
+
+                    <div class="layui-form-item">
+                        <label for="certificateSerialNumber" class="layui-form-label  layui-form-required">商户证书序列号</label>
+                        <div class="layui-input-inline layui-inline-12">
+                            <input name="certificateSerialNumber" lay-verify="required|verifycertificateSerialNumber" class="layui-input" lay-reqText="请输入商户证书序列号" placeholder="请输入商户证书序列号" />
+                        </div>
+                        <div class="layui-form-mid">
+                            微信支付商户=> 账户中心=> API安全=> 商户API证书=> 管理证书中获取
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item layui-form-text">
+                        <label for="certificate" class="layui-form-label layui-form-required">
+                            商户证书文件【apiclient_cert.p12】内容，请选择【apiclient_cert.p12】文件，会自动上传获取base64内容，不需要打开复制内容到这里
+                            <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" id="doUpload">
+                                <i class="layui-icon">&#xe67c;</i>上传证书
+                            </button>
+                        </label>
+                        <div class="layui-input-block">
+                            <textarea name="certificate" id="certificateBox" lay-verify="required" placeholder="请选择【apiclient_cert.p12】文件" class="layui-textarea"></textarea>
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item layui-form-text">
+                        <label for="certificatePrivateKey" class="layui-form-label  layui-form-required">商户证书文件【apiclient_key.pem】内容，注意是直接复制文件内容进来</label>
+                        <div class="layui-input-block">
+                            <textarea name="certificatePrivateKey" id="certificatePrivateKey" placeholder="请复制商户证书文件内容" class="layui-textarea"></textarea>
+                        </div>
+                        <div class="layui-form-mid">
+                            设置微信支付商户 API 证书私钥（通常为 `apiclient_key.pem` 文件内容）
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <label for="payType" class="layui-form-label  layui-form-required">高级模式</label>
+                        <div class="layui-input-inline layui-inline-5">
+                            <select name="payType" lay-verify="required" placeholder="请输入高级模式" lay-reqText="请输入高级模式">
+                                <option value="">请选择高级模式</option>
+                                {{# layui.each(d.params.data.weChatPayIdentityVerificationMethods, function(index, item){ }}
+                                <option value="{{ item.value }}">{{ item.description }}</option>
+                                {{# }); }}
+                            </select>
+                        </div>
+                        <div class="layui-form-mid">
+                            APIv3密钥模式下会用到，目前主要是【商家转账】功能。如果选择【微信支付公钥】模式，下面【平台公钥ID】【平台公钥内容】必填
+                        </div>
+                    </div>
+
+
+                    <div class="layui-form-item layui-form-text">
+                        <label for="platformSerialNumber" class="layui-form-label">平台证书序列号</label>
+                        <div class="layui-input-block">
+                            <input name="platformSerialNumber" class="layui-input" lay-reqText="请输入平台证书序列号" placeholder="请输入平台证书序列号" />
+                        </div>
+                        <div class="layui-form-mid">
+                            注意，这是平台证书序列号，不是商户证书序列号。
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item layui-form-text">
+                        <label for="platformPublicKeyId" class="layui-form-label">平台公钥ID</label>
+                        <div class="layui-input-block">
+                            <input name="platformPublicKeyId" lay-verify="required|verifyplatformPublicKeyId" class="layui-input" lay-reqText="请输入平台公钥ID" placeholder="请输入平台公钥ID" />
+                        </div>
+                        <div class="layui-form-mid">
+                            微信支付商户=> 账户中心=> API安全=> 微信支付公钥 => 申请公钥中查看
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item layui-form-text">
+                        <label for="platformPublicKey" class="layui-form-label">平台公钥内容（直接复制【pub_key.pem】文件内容粘贴此处即可）</label>
+                        <div class="layui-input-block">
+                            <textarea name="platformPublicKey" id="platformPublicKey" placeholder="请复制平台公钥内容" class="layui-textarea"></textarea>
+                        </div>
+                        <div class="layui-form-mid">
+                            微信支付商户=> 账户中心=> API安全=> 微信支付公钥 => 申请公钥中下载
+                        </div>
+                    </div>
+
+                </div>
             </div>
         </div>
 
-        <div class="layui-form-item">
-            <label for="apiKey" class="layui-form-label  layui-form-required">API秘钥</label>
-            <div class="layui-input-inline layui-inline-12">
-                <input name="apiKey" lay-verify="required" class="layui-input" placeholder="请输入API秘钥" lay-reqText="请输入API秘钥" />
-            </div>
-            <div class="layui-form-mid">
-                apiV2密钥
-            </div>
-        </div>
 
-        <div class="layui-form-item">
-            <label for="apiV3Key" class="layui-form-label">APIv3密钥</label>
-            <div class="layui-input-inline layui-inline-12">
-                <input name="apiV3Key" class="layui-input" placeholder="请输入APIv3密钥" lay-reqText="请输入APIv3密钥" />
-            </div>
-            <div class="layui-form-mid">
-                只有开启了商家付款到零钱的功能才需要录入APIv3密钥（用于提现）
-            </div>
-        </div>
-
-        <div class="layui-form-item layui-form-text">
-            <label for="certificate" class="layui-form-label layui-form-required">
-                微信支付商户p12证书，请选择【apiclient_cert.p12】文件
-                <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" id="doUpload">
-                    <i class="layui-icon">&#xe67c;</i>上传证书
-                </button>
-            </label>
-            <div class="layui-input-block">
-                <textarea name="certificate" id="certificateBox" lay-verify="required" placeholder="请选择【apiclient_cert.p12】文件" class="layui-textarea"></textarea>
-            </div>
-        </div>
-
-        <div class="layui-form-item">
-            <label for="rsaPublicKey" class="layui-form-label">RSA公钥</label>
-            <div class="layui-input-inline layui-inline-8">
-                <input name="rsaPublicKey" class="layui-input" placeholder="请输入RSA公钥" lay-reqText="请输入RSA公钥" />
-            </div>
-            <div class="layui-form-mid">
-                目前仅"企业付款到银行卡API"使用，调用"获取RSA加密公钥API"即可获取
-            </div>
-        </div>
-
-        <div class="layui-form-item">
-            <label for="subAppId" class="layui-form-label">子商户应用号</label>
-            <div class="layui-input-inline layui-inline-4">
-                <input name="subAppId" class="layui-input" placeholder="请输入子商户应用号" lay-reqText="请输入子商户应用号" />
-            </div>
-            <div class="layui-form-mid">
-                目前仅调用服务商API时使用，子商户的公众号、移动应用AppId。
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label for="subMchId" class="layui-form-label">子商户号</label>
-            <div class="layui-input-inline layui-inline-4">
-                <input name="subMchId" class="layui-input" placeholder="请输入子商户号" lay-reqText="请输入子商户号" />
-            </div>
-            <div class="layui-form-mid">
-                目前仅调用服务商API时使用，子商户的商户号。
-            </div>
-        </div>
-
-        <div class="layui-form-item">
-            <label for="notifyUrl" class="layui-form-label layui-form-required">支付回调通知</label>
-            <div class="layui-input-inline layui-inline-8">
-                <input name="notifyUrl" lay-verify="required" class="layui-input" placeholder="请输入支付回调通知" lay-reqText="请输入支付回调通知" value="https://api.pro.demo.corecms.cn/Notify/WeChatPay/Unifiedorder" />
-            </div>
-            <div class="layui-form-mid">
-                webApi端接口地址+【/Notify/WeChatPay/Unifiedorder】
-            </div>
-        </div>
-
-        <div class="layui-form-item">
-            <label for="refundUrl" class="layui-form-label  layui-form-required">退款回调</label>
-            <div class="layui-input-inline layui-inline-8">
-                <input name="refundUrl" lay-verify="required" class="layui-input" placeholder="请输入退款回调" lay-reqText="请输入退款回调" value="https://api.pro.demo.corecms.cn/Notify/WeChatPay/Refund" />
-            </div>
-            <div class="layui-form-mid">
-                webApi端接口地址+【/Notify/WeChatPay/Refund】
-            </div>
-        </div>
-
-        <div class="layui-form-item">
-            <label for="jumpUrl" class="layui-form-label">跳转地址</label>
-            <div class="layui-input-inline layui-inline-8">
-                <input name="jumpUrl" class="layui-input" placeholder="请输入跳转地址" lay-reqText="请输入跳转地址" />
-            </div>
-            <div class="layui-form-mid">
-                H5，PC端支付成功或者支付失败后跳转的查询支付状态的地址。（默认可不填写）
-            </div>
-        </div>
-
-        <div class="layui-form-item">
-            <label for="isEnable" class="layui-form-label  layui-form-required">是否开启</label>
-            <div class="layui-input-inline layui-inline-4">
-                <input type="checkbox" lay-filter="switch" name="isEnable" lay-skin="switch" lay-text="开启|关闭">
-            </div>
-            <label for="isDefault" class="layui-form-label  layui-form-required">是否本类默认</label>
-            <div class="layui-input-inline layui-inline-4">
-                <input type="checkbox" lay-filter="switch" name="isDefault" lay-skin="switch" lay-text="开启|关闭">
-            </div>
-        </div>
 
         <div class="layui-form-item text-right core-hidden">
             <input type="button" class="layui-btn" lay-submit lay-filter="LAY-app-CoreCmsWeChatPayConfig-createForm-submit" id="LAY-app-CoreCmsWeChatPayConfig-createForm-submit" value="确认添加">
@@ -134,7 +227,7 @@
     layui.data.done = function (d) {
         //开启调试情况下获取接口赋值数据
         if (debug) { console.log(d.params.data); }
-        layui.use(['admin', 'form', 'laydate', 'upload', 'coreHelper', 'cropperImg'],
+        layui.use(['admin', 'form', 'laydate', 'upload', 'coreHelper', 'cropperImg', 'tabs'],
             function () {
                 var $ = layui.$
                     , form = layui.form
@@ -142,6 +235,7 @@
                     , laydate = layui.laydate
                     , upload = layui.upload
                     , cropperImg = layui.cropperImg
+                    , tabs = layui.tabs
                     , coreHelper = layui.coreHelper;
 
                 var upload = layui.upload;

CoreCms.Net.Web.Admin/wwwroot/views/shop/pay/wechatpayconfig/edit.html

@@ -2,127 +2,219 @@
     <div class="layui-form coreshop-form layui-form-pane" lay-filter="LAY-app-CoreCmsWeChatPayConfig-editForm" id="LAY-app-CoreCmsWeChatPayConfig-editForm">
         <input type="hidden" name="id" value="{{d.params.data.model.id || '' }}" />
 
-        <div class="layui-form-item">
+        <div class="layui-tab" lay-filter="test-handle" lay-allowclose="true">
-            <label for="appType" class="layui-form-label  layui-form-required">应用类型</label>
+            <ul class="layui-tab-title">
-            <div class="layui-input-inline layui-inline-5">
+                <li class="layui-this" lay-id="11">基础设置</li>
-                <select name="appType" lay-verify="required" placeholder="请输入应用类型" lay-reqText="请输入应用类型">
+                <li lay-id="22">证书密钥配置</li>
-                    <option value="">请选择所属应用类型</option>
+            </ul>
-                    {{# layui.each(d.params.data.weiChatPayTradeType, function(index, item){ }}
+            <div class="layui-tab-content">
-                    <option value="{{ item.title }}" {{item.title===d.params.data.model.appType?'selected="selected"':''}}>{{ item.description }}</option>
+                <div class="layui-tab-item layui-show">
-                    {{# }); }}
+
-                </select>
+                    <div class="layui-form-item">
-            </div>
+                        <label for="appType" class="layui-form-label  layui-form-required">应用类型</label>
-            <label for="appId" class="layui-form-label  layui-form-required">应用AppID</label>
+                        <div class="layui-input-inline layui-inline-5">
-            <div class="layui-input-inline layui-inline-5">
+                            <select name="appType" lay-verify="required" placeholder="请输入应用类型" lay-reqText="请输入应用类型">
-                <input name="appId" lay-verify="required" class="layui-input" placeholder="请输入应用号" lay-reqText="请输入应用号" value="{{d.params.data.model.appId || '' }}" />
+                                <option value="">请选择所属应用类型</option>
-            </div>
+                                {{# layui.each(d.params.data.weiChatPayTradeType, function(index, item){ }}
-            <label for="mchId" class="layui-form-label  layui-form-required">商户号</label>
+                                <option value="{{ item.title }}" {{item.title===d.params.data.model.appType?'selected="selected"':''}}>{{ item.description }}</option>
-            <div class="layui-input-inline layui-inline-5">
+                                {{# }); }}
-                <input name="mchId" lay-verify="required" class="layui-input" placeholder="请输入商户号" lay-reqText="请输入商户号" value="{{d.params.data.model.mchId || '' }}" />
+                            </select>
+                        </div>
+                        <label for="appId" class="layui-form-label  layui-form-required">应用AppID</label>
+                        <div class="layui-input-inline layui-inline-5">
+                            <input name="appId" lay-verify="required" class="layui-input" placeholder="请输入应用号" lay-reqText="请输入应用号" value="{{d.params.data.model.appId || '' }}" />
+                        </div>
+                        <label for="mchId" class="layui-form-label  layui-form-required">商户号</label>
+                        <div class="layui-input-inline layui-inline-5">
+                            <input name="mchId" lay-verify="required" class="layui-input" placeholder="请输入商户号" lay-reqText="请输入商户号" value="{{d.params.data.model.mchId || '' }}" />
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <label for="subAppId" class="layui-form-label">子商户应用号</label>
+                        <div class="layui-input-inline layui-inline-4">
+                            <input name="subAppId" class="layui-input" placeholder="请输入子商户应用号" lay-reqText="请输入子商户应用号" value="{{d.params.data.model.subAppId || '' }}" />
+                        </div>
+                        <div class="layui-form-mid">
+                            目前仅调用服务商API时使用，子商户的公众号、移动应用AppId。
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <label for="subMchId" class="layui-form-label">子商户号</label>
+                        <div class="layui-input-inline layui-inline-4">
+                            <input name="subMchId" class="layui-input" placeholder="请输入子商户号" lay-reqText="请输入子商户号" value="{{d.params.data.model.subMchId || '' }}" />
+                        </div>
+                        <div class="layui-form-mid">
+                            目前仅调用服务商API时使用，子商户的商户号。
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <label for="notifyUrl" class="layui-form-label  layui-form-required">支付回调通知</label>
+                        <div class="layui-input-inline layui-inline-10">
+                            <input name="notifyUrl" lay-verify="required" class="layui-input" placeholder="请输入支付回调通知" lay-reqText="请输入支付回调通知" value="{{d.params.data.model.notifyUrl || '' }}" />
+                        </div>
+                        <div class="layui-form-mid">
+                            webApi端接口地址+【/Notify/WeChatPay/Unifiedorder】
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <label for="refundUrl" class="layui-form-label  layui-form-required">退款回调</label>
+                        <div class="layui-input-inline layui-inline-10">
+                            <input name="refundUrl" lay-verify="required" class="layui-input" placeholder="请输入退款回调" lay-reqText="请输入退款回调" value="{{d.params.data.model.refundUrl || '' }}" />
+                        </div>
+                        <div class="layui-form-mid">
+                            webApi端接口地址+【/Notify/WeChatPay/Refund】
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <label for="refundUrl" class="layui-form-label  layui-form-required">提现回调通知</label>
+                        <div class="layui-input-inline layui-inline-10">
+                            <input name="transferBillsUrl" lay-verify="required" class="layui-input" placeholder="请输入提现回调通知" lay-reqText="请输入提现回调通知" value="{{d.params.data.model.transferBillsUrl || '' }}" />
+                        </div>
+                        <div class="layui-form-mid">
+                            webApi端接口地址+【/Notify/WeChatPay/TransferBillsCallBack】
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <label for="jumpUrl" class="layui-form-label">跳转地址</label>
+                        <div class="layui-input-inline layui-inline-8">
+                            <input name="jumpUrl" class="layui-input" placeholder="请输入跳转地址" lay-reqText="请输入跳转地址" value="{{d.params.data.model.jumpUrl || '' }}" />
+                        </div>
+                        <div class="layui-form-mid">
+                            H5，PC端支付成功或者支付失败后跳转的查询支付状态的地址。（默认可不填写）
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <label for="isEnable" class="layui-form-label  layui-form-required">是否开启</label>
+                        <div class="layui-input-inline layui-inline-4">
+                            <input type="checkbox" lay-filter="switch" name="isEnable" {{ d.params.data.model.isEnable ? 'checked' : '' }} lay-skin="switch" lay-text="开启|关闭">
+                        </div>
+                        <label for="isDefault" class="layui-form-label  layui-form-required">是否本类默认</label>
+                        <div class="layui-input-inline layui-inline-4">
+                            <input type="checkbox" lay-filter="switch" name="isDefault" {{ d.params.data.model.isDefault ? 'checked' : '' }} lay-skin="switch" lay-text="开启|关闭">
+                        </div>
+                    </div>
+
+                </div>
+                <div class="layui-tab-item">
+
+                    <div class="layui-form-item">
+                        <label for="rsaPublicKey" class="layui-form-label">RSA公钥（弃用）</label>
+                        <div class="layui-input-inline layui-inline-8">
+                            <input name="rsaPublicKey" class="layui-input" placeholder="请输入RSA公钥" lay-reqText="请输入RSA公钥" value="{{d.params.data.model.rsaPublicKey || '' }}" />
+                        </div>
+                        <div class="layui-form-mid">
+                            目前仅"企业付款到银行卡API"使用，调用"获取RSA加密公钥API"即可获取
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <label for="apiKey" class="layui-form-label  layui-form-required">APIv2密钥</label>
+                        <div class="layui-input-inline layui-inline-12">
+                            <input name="apiKey" lay-verify="required" class="layui-input" placeholder="请输入API秘钥" lay-reqText="请输入API秘钥" value="{{d.params.data.model.apiKey || '' }}" />
+                        </div>
+                        <div class="layui-form-mid">
+                            apiV2密钥
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <label for="apiV3Key" class="layui-form-label">APIv3密钥</label>
+                        <div class="layui-input-inline layui-inline-12">
+                            <input name="apiV3Key" class="layui-input" placeholder="请输入APIv3密钥" lay-reqText="请输入APIv3密钥" value="{{d.params.data.model.apiV3Key || '' }}" />
+                        </div>
+                        <div class="layui-form-mid">
+                            只有开启了商家付款到零钱的功能才需要录入APIv3密钥（用于提现）
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <label for="certificateSerialNumber" class="layui-form-label  layui-form-required">商户证书序列号</label>
+                        <div class="layui-input-inline layui-inline-12">
+                            <input name="certificateSerialNumber" lay-verify="required|verifycertificateSerialNumber" value="{{d.params.data.model.certificateSerialNumber || '' }}" class="layui-input" lay-reqText="请输入商户证书序列号" placeholder="请输入商户证书序列号" />
+                        </div>
+                        <div class="layui-form-mid">
+                            微信支付商户=> 账户中心=> API安全=> 商户API证书=> 管理证书中获取
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item layui-form-text">
+                        <label for="certificate" class="layui-form-label  layui-form-required">
+                            商户证书文件【apiclient_cert.p12】内容，请选择【apiclient_cert.p12】文件，会自动上传获取base64内容，不需要打开复制内容到这里
+                            <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" id="doUpload">
+                                <i class="layui-icon">&#xe67c;</i>上传证书
+                            </button>
+                        </label>
+                        <div class="layui-input-block">
+                            <textarea name="certificate" id="certificateBox" lay-verify="required" placeholder="请选择【apiclient_cert.p12】文件" class="layui-textarea">{{d.params.data.model.certificate || '' }}</textarea>
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item layui-form-text">
+                        <label for="certificatePrivateKey" class="layui-form-label  layui-form-required">商户证书文件【apiclient_key.pem】内容，注意是直接复制文件内容进来</label>
+                        <div class="layui-input-block">
+                            <textarea name="certificatePrivateKey" id="certificatePrivateKey" placeholder="请复制商户证书文件内容" class="layui-textarea">{{d.params.data.model.certificatePrivateKey || '' }}</textarea>
+                        </div>
+                        <div class="layui-form-mid">
+                            设置微信支付商户 API 证书私钥（通常为 `apiclient_key.pem` 文件内容）
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <label for="payType" class="layui-form-label  layui-form-required">高级模式</label>
+                        <div class="layui-input-block">
+                            <select name="payType" lay-verify="required" placeholder="请输入高级模式" lay-reqText="请输入高级模式">
+                                <option value="">请选择高级模式</option>
+                                {{# layui.each(d.params.data.weChatPayIdentityVerificationMethods, function(index, item){ }}
+                                <option value="{{ item.value }}" {{item.value===d.params.data.model.payType?'selected="selected"':''}}>{{ item.description }}</option>
+                                {{# }); }}
+                            </select>
+                        </div>
+                        <div class="layui-form-mid">
+                            APIv3密钥模式下会用到，目前主要是【商家转账】功能。如果选择【微信支付公钥】模式，下面【平台公钥ID】【平台公钥内容】必填，【转换模式是指从平台证书模式切换到公钥模式】
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item layui-form-text">
+                        <label for="platformSerialNumber" class="layui-form-label">平台证书序列号</label>
+                        <div class="layui-input-block">
+                            <input name="platformSerialNumber" value="{{d.params.data.model.platformSerialNumber || '' }}" class="layui-input" lay-reqText="请输入平台证书序列号" placeholder="请输入平台证书序列号" />
+                        </div>
+                        <div class="layui-form-mid">
+                            注意，这是平台证书序列号，不是商户证书序列号。
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item layui-form-text">
+                        <label for="platformPublicKeyId" class="layui-form-label">平台公钥ID</label>
+                        <div class="layui-input-block">
+                            <input name="platformPublicKeyId" value="{{d.params.data.model.platformPublicKeyId || '' }}" class="layui-input" lay-reqText="请输入平台公钥ID" placeholder="请输入平台公钥ID" />
+                        </div>
+                        <div class="layui-form-mid">
+                            微信支付商户=> 账户中心=> API安全=> 微信支付公钥 => 申请公钥中查看
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item layui-form-text">
+                        <label for="platformPublicKey" class="layui-form-label">平台公钥内容（直接复制【pub_key.pem】文件内容粘贴此处即可）</label>
+                        <div class="layui-input-block">
+                            <textarea name="platformPublicKey" id="platformPublicKey" placeholder="请复制平台公钥内容" class="layui-textarea">{{d.params.data.model.platformPublicKey || '' }}</textarea>
+                        </div>
+                        <div class="layui-form-mid">
+                            微信支付商户=> 账户中心=> API安全=> 微信支付公钥 => 申请公钥中下载
+                        </div>
+                    </div>
+
+                </div>
             </div>
         </div>
 
-        <div class="layui-form-item">
-            <label for="apiKey" class="layui-form-label  layui-form-required">API秘钥</label>
-            <div class="layui-input-inline layui-inline-12">
-                <input name="apiKey" lay-verify="required" class="layui-input" placeholder="请输入API秘钥" lay-reqText="请输入API秘钥" value="{{d.params.data.model.apiKey || '' }}" />
-            </div>
-            <div class="layui-form-mid">
-                apiV2密钥
-            </div>
-        </div>
 
-        <div class="layui-form-item">
-            <label for="apiV3Key" class="layui-form-label">APIv3密钥</label>
-            <div class="layui-input-inline layui-inline-12">
-                <input name="apiV3Key" class="layui-input" placeholder="请输入APIv3密钥" lay-reqText="请输入APIv3密钥" value="{{d.params.data.model.apiV3Key || '' }}" />
-            </div>
-            <div class="layui-form-mid">
-                只有开启了商家付款到零钱的功能才需要录入APIv3密钥（用于提现）
-            </div>
-        </div>
-
-        <div class="layui-form-item layui-form-text">
-            <label for="certificate" class="layui-form-label  layui-form-required">
-                微信支付商户p12证书，请选择【apiclient_cert.p12】文件
-                <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" id="doUpload">
-                    <i class="layui-icon">&#xe67c;</i>上传证书
-                </button>
-            </label>
-            <div class="layui-input-block">
-                <textarea name="certificate" id="certificateBox" lay-verify="required" placeholder="请选择【apiclient_cert.p12】文件" class="layui-textarea">{{d.params.data.model.certificate || '' }}</textarea>
-            </div>
-        </div>
-
-        <div class="layui-form-item">
-            <label for="rsaPublicKey" class="layui-form-label">RSA公钥</label>
-            <div class="layui-input-inline layui-inline-8">
-                <input name="rsaPublicKey" class="layui-input" placeholder="请输入RSA公钥" lay-reqText="请输入RSA公钥" value="{{d.params.data.model.rsaPublicKey || '' }}" />
-            </div>
-            <div class="layui-form-mid">
-                目前仅"企业付款到银行卡API"使用，调用"获取RSA加密公钥API"即可获取
-            </div>
-        </div>
-
-        <div class="layui-form-item">
-            <label for="subAppId" class="layui-form-label">子商户应用号</label>
-            <div class="layui-input-inline layui-inline-4">
-                <input name="subAppId" class="layui-input" placeholder="请输入子商户应用号" lay-reqText="请输入子商户应用号" value="{{d.params.data.model.subAppId || '' }}" />
-            </div>
-            <div class="layui-form-mid">
-                目前仅调用服务商API时使用，子商户的公众号、移动应用AppId。
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label for="subMchId" class="layui-form-label">子商户号</label>
-            <div class="layui-input-inline layui-inline-4">
-                <input name="subMchId" class="layui-input" placeholder="请输入子商户号" lay-reqText="请输入子商户号" value="{{d.params.data.model.subMchId || '' }}" />
-            </div>
-            <div class="layui-form-mid">
-                目前仅调用服务商API时使用，子商户的商户号。
-            </div>
-        </div>
-
-        <div class="layui-form-item">
-            <label for="notifyUrl" class="layui-form-label  layui-form-required">支付回调通知</label>
-            <div class="layui-input-inline layui-inline-8">
-                <input name="notifyUrl" lay-verify="required" class="layui-input" placeholder="请输入支付回调通知" lay-reqText="请输入支付回调通知" value="{{d.params.data.model.notifyUrl || '' }}" />
-            </div>
-            <div class="layui-form-mid">
-                webApi端接口地址+【/Notify/WeChatPay/Unifiedorder】
-            </div>
-        </div>
-
-        <div class="layui-form-item">
-            <label for="refundUrl" class="layui-form-label  layui-form-required">退款回调</label>
-            <div class="layui-input-inline layui-inline-8">
-                <input name="refundUrl" lay-verify="required" class="layui-input" placeholder="请输入退款回调" lay-reqText="请输入退款回调" value="{{d.params.data.model.refundUrl || '' }}" />
-            </div>
-            <div class="layui-form-mid">
-                webApi端接口地址+【/Notify/WeChatPay/Refund】
-            </div>
-        </div>
-
-        <div class="layui-form-item">
-            <label for="jumpUrl" class="layui-form-label">跳转地址</label>
-            <div class="layui-input-inline layui-inline-8">
-                <input name="jumpUrl" class="layui-input" placeholder="请输入跳转地址" lay-reqText="请输入跳转地址" value="{{d.params.data.model.jumpUrl || '' }}" />
-            </div>
-            <div class="layui-form-mid">
-                H5，PC端支付成功或者支付失败后跳转的查询支付状态的地址。（默认可不填写）
-            </div>
-        </div>
-
-        <div class="layui-form-item">
-            <label for="isEnable" class="layui-form-label  layui-form-required">是否开启</label>
-            <div class="layui-input-inline layui-inline-4">
-                <input type="checkbox" lay-filter="switch" name="isEnable" {{ d.params.data.model.isEnable ? 'checked' : '' }} lay-skin="switch" lay-text="开启|关闭">
-            </div>
-            <label for="isDefault" class="layui-form-label  layui-form-required">是否本类默认</label>
-            <div class="layui-input-inline layui-inline-4">
-                <input type="checkbox" lay-filter="switch" name="isDefault" {{ d.params.data.model.isDefault ? 'checked' : '' }} lay-skin="switch" lay-text="开启|关闭">
-            </div>
-        </div>
 
         <div class="layui-form-item text-right core-hidden">
             <input type="button" class="layui-btn" lay-submit lay-filter="LAY-app-CoreCmsWeChatPayConfig-editForm-submit" id="LAY-app-CoreCmsWeChatPayConfig-editForm-submit" value="确认编辑">

CoreCms.Net.Web.Admin/wwwroot/views/shop/pay/wechatpayconfig/index.html

@@ -154,12 +154,12 @@
                             { field: 'apiKey', title: 'API秘钥', sort: false, width: 155 },
                             //{ field: 'apiV3Key', title: 'APIv3密钥', sort: false, width: 105 },
                             //{ field: 'certificate', title: 'p12证书base64', sort: false, width: 105 },
-                            { field: 'rsaPublicKey', title: 'RSA公钥', sort: false, width: 105 },
+                            //{ field: 'rsaPublicKey', title: 'RSA公钥', sort: false, width: 105 },
-                            { field: 'subAppId', title: '子商户应用号', sort: false, width: 105 },
+                            //{ field: 'subAppId', title: '子商户应用号', sort: false, width: 105 },
-                            { field: 'subMchId', title: '子商户号', sort: false, width: 105 },
+                            //{ field: 'subMchId', title: '子商户号', sort: false, width: 105 },
                             { field: 'notifyUrl', title: '支付回调通知', sort: false },
                             { field: 'refundUrl', title: '退款回调', sort: false },
-                            { field: 'jumpUrl', title: '跳转地址', sort: false },
+                            { field: 'transferBillsUrl', title: '提现回调通知', sort: false },
                             { field: 'isEnable', title: '是否开启', width: 95, templet: '#switch_isEnable', sort: false, unresize: true },
                             { field: 'isDefault', title: '是否本类默认', width: 95, templet: '#switch_isDefault', sort: false, unresize: true },
                             //{ field: 'appType', title: '应用类型', sort: false, width: 105 },
@@ -246,7 +246,7 @@
                                             });
                                     });
                                     // 禁止弹窗出现滚动条
-                                    $(layero).children('.layui-layer-content').css('overflow', 'visible');
+                                    //$(layero).children('.layui-layer-content').css('overflow', 'visible');
                                 }
                                 , btn: ['确定', '取消']
                                 , yes: function (index, layero) {
@@ -292,7 +292,7 @@
                                             });
                                     })
                                     // 禁止弹窗出现滚动条
-                                    $(layero).children('.layui-layer-content').css('overflow', 'visible');
+                                    //$(layero).children('.layui-layer-content').css('overflow', 'visible');
                                 }
                                 , btn: ['确定', '取消']
                                 , yes: function (index, layero) {

CoreCms.Net.Web.WebApi/Controllers/PayNotify/WeChatPayController.cs

@@ -8,20 +8,24 @@
  *        Description: 暂无
  ***********************************************************************/
 
+using CoreCms.Net.Caching.AutoMate.RedisCache;
 using CoreCms.Net.Configuration;
 using CoreCms.Net.IServices;
 using CoreCms.Net.Loging;
 using CoreCms.Net.Model.Entities;
+using CoreCms.Net.Model.FromBody;
+using Essensoft.Paylink.WeChatPay;
+using Essensoft.Paylink.WeChatPay.V2;
+using Essensoft.Paylink.WeChatPay.V2.Notify;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 using NLog;
 using System;
+using System.Linq;
 using System.Threading.Tasks;
-using CoreCms.Net.Caching.AutoMate.RedisCache;
+using SKIT.FlurlHttpClient.Wechat.TenpayV3;
-using Essensoft.Paylink.WeChatPay;
-using Essensoft.Paylink.WeChatPay.V2;
-using Essensoft.Paylink.WeChatPay.V2.Notify;
 
 namespace CoreCms.Net.Web.WebApi.Controllers.PayNotify
 {
@@ -31,26 +35,31 @@ namespace CoreCms.Net.Web.WebApi.Controllers.PayNotify
     [Route("Notify/[controller]/[action]")]
     public class WeChatPayController : ControllerBase
     {
-        private readonly ICoreCmsBillPaymentsServices _billPaymentsServices;
         private readonly ICoreCmsBillRefundServices _billRefundServices;
         private readonly IWeChatPayNotifyClient _client;
         private readonly IRedisOperationRepository _redisOperationRepository;
 
         private readonly IWeChatPayConfigServices _weChatPayConfigServices;
+        private readonly ICoreCmsUserTocashWeChatNotifyServices _userTocashWeChatNotifyServices;
 
+        private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly IWechatTenpayClientFactory _wechatTenpayClientFactory;
+        private readonly ICoreCmsUserTocashServices _userTocashServices;
 
         /// <summary>
         ///     构造函数
         /// </summary>
         public WeChatPayController(
-            IWeChatPayNotifyClient client
+            IWeChatPayNotifyClient client, ICoreCmsBillRefundServices billRefundServices, IRedisOperationRepository redisOperationRepository, IWeChatPayConfigServices weChatPayConfigServices, ICoreCmsUserTocashWeChatNotifyServices userTocashWeChatNotifyServices, IHttpContextAccessor httpContextAccessor, IWechatTenpayClientFactory wechatTenpayClientFactory, ICoreCmsUserTocashServices userTocashServices)
-            , ICoreCmsBillPaymentsServices billPaymentsServices, ICoreCmsBillRefundServices billRefundServices, IRedisOperationRepository redisOperationRepository, IWeChatPayConfigServices weChatPayConfigServices)
         {
             _client = client;
-            _billPaymentsServices = billPaymentsServices;
             _billRefundServices = billRefundServices;
             _redisOperationRepository = redisOperationRepository;
             _weChatPayConfigServices = weChatPayConfigServices;
+            _userTocashWeChatNotifyServices = userTocashWeChatNotifyServices;
+            _httpContextAccessor = httpContextAccessor;
+            _wechatTenpayClientFactory = wechatTenpayClientFactory;
+            _userTocashServices = userTocashServices;
         }
 
         /// <summary>
@@ -146,5 +155,151 @@ namespace CoreCms.Net.Web.WebApi.Controllers.PayNotify
                 return NoContent();
             }
         }
+
+
+        /// <summary>
+        /// 商家转账回调通知
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IActionResult> TransferBillsCallBack(
+            [FromHeader(Name = "Wechatpay-Timestamp")] string timestamp,
+            [FromHeader(Name = "Wechatpay-Nonce")] string nonce,
+            [FromHeader(Name = "Wechatpay-Signature")] string signature,
+            [FromHeader(Name = "Wechatpay-Serial")] string serialNumber,
+            [FromBody] FMTransferBillsCallBack entity)
+        {
+            try
+            {
+                NLogUtil.WriteAll(LogLevel.Trace, LogType.Refund, "商家转账回调通知", JsonConvert.SerializeObject(entity));
+                // 检查请求头是否包含必要的字段
+                if (entity == null)
+                {
+                    var obj = new
+                    {
+                        code = "FAIL",
+                        message = "失败"
+                    };
+                    return new JsonResult(obj);
+                }
+
+                // 存储回调数据
+                var log = new CoreCmsUserTocashWeChatNotify
+                {
+                    wechatpayNonce = nonce,
+                    wechatpaySerial = serialNumber,
+                    wechatpaySignature = signature,
+                    wechatpayTimestamp = timestamp,
+                    callBackId = entity.id,
+                    create_time = entity.create_time,
+                    resource_type = entity.resource_type,
+                    event_type = entity.event_type,
+                    summary = entity.summary,
+                    resource = JsonConvert.SerializeObject(entity.resource),
+                    createTime = DateTime.Now
+                };
+                // 获取返回序列
+                var id = await _userTocashWeChatNotifyServices.ExecuteReturnIdentityAsync(log);
+
+                // 获取支付配置
+                var payConfig = await _weChatPayConfigServices.QueryByClauseAsync(p =>
+                    p.isDefault == true && p.isEnable == true &&
+                    p.appType == GlobalEnumVars.WeiChatPayTradeType.JSAPI.ToString());
+
+                // 构建WeChatPay客户端
+                var client = await _wechatTenpayClientFactory.Create(payConfig.mchId);
+
+                // 验证签名
+                bool valid = await client.VerifyEventSignatureAsync(
+                    webhookTimestamp: timestamp,
+                    webhookNonce: nonce,
+                    webhookBody: JsonConvert.SerializeObject(entity),
+                    webhookSignature: signature,
+                    webhookSerialNumber: serialNumber
+                );
+
+                // 如果验签失败，返回错误信息
+                if (!valid)
+                {
+                    return new JsonResult(new { code = "FAIL", message = "验签失败" });
+                }
+
+                // 反序列化回调模型
+                var callbackModel = client.DeserializeEvent(JsonConvert.SerializeObject(entity));
+                var eventType = callbackModel.EventType?.ToUpper();
+
+                // 处理不同的事件类型
+                if (eventType == "MCHTRANSFER.BILL.FINISHED")
+                {
+                    var callbackResource = client.DecryptEventResource<SKIT.FlurlHttpClient.Wechat.TenpayV3.Events.MerchantTransferBillFinishedResource>(callbackModel);
+
+                    if (callbackResource != null)
+                    {
+                        //更新解密数据
+                        await _userTocashWeChatNotifyServices.UpdateAsync(p => new CoreCmsUserTocashWeChatNotify
+                        {
+                            decryptedData = JsonConvert.SerializeObject(callbackResource)
+                        }, p => p.id == id);
+
+                        //业务处理
+                        var usertocash = callbackResource.OutBillNumber.Replace("usertocash", "");
+                        var userTocashId = Convert.ToInt32(usertocash);
+
+                        switch (callbackResource.State)
+                        {
+                            //转账成功
+                            case "SUCCESS":
+                                await _userTocashServices.UpdateAsync(p => new CoreCmsUserTocash()
+                                {
+                                    needUserGet = false,
+                                }, p => p.id == userTocashId);
+                                break;
+
+                            //单据已受理
+                            case "ACCEPTED":
+                                break;
+
+                            //单据处理中，转账结果尚未明确，如一直处于此状态，建议检查账户余额是否足够
+                            case "PROCESSING":
+                                break;
+
+                            //待收款用户确认，可拉起微信收款确认页面进行收款确认
+                            case "WAIT_USER_CONFIRM":
+                                break;
+
+                            //转账失败
+                            case "FAIL":
+                                break;
+
+                            //撤销中
+                            case "CANCELING":
+                                break;
+
+                            //撤销
+                            case "CANCELLED":
+                                break;
+                        }
+                    }
+                }
+                else
+                {
+                    // 其他情况略
+                }
+
+                return NoContent();
+            }
+            catch (Exception ex)
+            {
+                NLogUtil.WriteAll(LogLevel.Trace, LogType.Refund, "商家转账回调通知", "结果通知", ex);
+
+                var obj = new
+                {
+                    code = "FAIL",
+                    message = "失败"
+                };
+                return new JsonResult(obj);
+            }
+        }
+
     }
 }

CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml

@@ -839,7 +839,7 @@
                 微信支付异步通知
             </summary>
         </member>
-        <member name="M:CoreCms.Net.Web.WebApi.Controllers.PayNotify.WeChatPayController.#ctor(Essensoft.Paylink.WeChatPay.V2.IWeChatPayNotifyClient,CoreCms.Net.IServices.ICoreCmsBillPaymentsServices,CoreCms.Net.IServices.ICoreCmsBillRefundServices,CoreCms.Net.Caching.AutoMate.RedisCache.IRedisOperationRepository,CoreCms.Net.IServices.IWeChatPayConfigServices)">
+        <member name="M:CoreCms.Net.Web.WebApi.Controllers.PayNotify.WeChatPayController.#ctor(Essensoft.Paylink.WeChatPay.V2.IWeChatPayNotifyClient,CoreCms.Net.IServices.ICoreCmsBillRefundServices,CoreCms.Net.Caching.AutoMate.RedisCache.IRedisOperationRepository,CoreCms.Net.IServices.IWeChatPayConfigServices,CoreCms.Net.IServices.ICoreCmsUserTocashWeChatNotifyServices,Microsoft.AspNetCore.Http.IHttpContextAccessor,CoreCms.Net.IServices.IWechatTenpayClientFactory,CoreCms.Net.IServices.ICoreCmsUserTocashServices)">
             <summary>
                 构造函数
             </summary>
@@ -854,6 +854,12 @@
                 退款结果通知
             </summary>
         </member>
+        <member name="M:CoreCms.Net.Web.WebApi.Controllers.PayNotify.WeChatPayController.TransferBillsCallBack(System.String,System.String,System.String,System.String,CoreCms.Net.Model.FromBody.FMTransferBillsCallBack)">
+            <summary>
+            商家转账回调通知
+            </summary>
+            <returns></returns>
+        </member>
         <member name="T:CoreCms.Net.Web.WebApi.Controllers.PinTuanController">
             <summary>
             拼团接口

数据库/SqlServer/20250729/升级脚本/2、新增【微信支付平台证书表】CoreCmsWeChatPayPlatformCertificate.sql

@@ -0,0 +1,56 @@
+
+/****** Object:  Table [dbo].[CoreCmsWeChatPayPlatformCertificate]    Script Date: 2025/7/29 0:19:29 ******/
+SET ANSI_NULLS ON
+GO
+
+SET QUOTED_IDENTIFIER ON
+GO
+
+CREATE TABLE [dbo].[CoreCmsWeChatPayPlatformCertificate](
+	[id] [INT] IDENTITY(1,1) NOT NULL,
+	[algorithmType] [NVARCHAR](50) NOT NULL,
+	[certificate] [NVARCHAR](MAX) NOT NULL,
+	[effectiveTime] [DATETIME] NOT NULL,
+	[expireTime] [DATETIME] NOT NULL,
+	[serialNumber] [NVARCHAR](50) NOT NULL,
+	[merchantId] [NVARCHAR](50) NOT NULL,
+	[createTime] [DATETIME] NOT NULL,
+	[updataTime] [DATETIME] NULL,
+ CONSTRAINT [PK_CoreCmsWeChatPayPlatformCertificate] PRIMARY KEY CLUSTERED 
+(
+	[id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'<EFBFBD><EFBFBD><EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsWeChatPayPlatformCertificate', @level2type=N'COLUMN',@level2name=N'id'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֤<EFBFBD><EFBFBD><EFBFBD>㷨<EFBFBD><EFBFBD><EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsWeChatPayPlatformCertificate', @level2type=N'COLUMN',@level2name=N'algorithmType'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֤<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsWeChatPayPlatformCertificate', @level2type=N'COLUMN',@level2name=N'certificate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'<EFBFBD><EFBFBD>ȡ<EFBFBD><EFBFBD>Чʱ<EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsWeChatPayPlatformCertificate', @level2type=N'COLUMN',@level2name=N'effectiveTime'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'<EFBFBD><EFBFBD>ȡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsWeChatPayPlatformCertificate', @level2type=N'COLUMN',@level2name=N'expireTime'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֤<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsWeChatPayPlatformCertificate', @level2type=N'COLUMN',@level2name=N'serialNumber'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'<EFBFBD>̻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsWeChatPayPlatformCertificate', @level2type=N'COLUMN',@level2name=N'merchantId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsWeChatPayPlatformCertificate', @level2type=N'COLUMN',@level2name=N'createTime'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsWeChatPayPlatformCertificate', @level2type=N'COLUMN',@level2name=N'updataTime'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'΢<EFBFBD><EFBFBD>֧<EFBFBD><EFBFBD>ƽ̨֤<EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsWeChatPayPlatformCertificate'
+GO
+
+

数据库/SqlServer/20250729/升级脚本/3、新增【用户提现使用商家转账微信回调通知表】CoreCmsUserTocashWeChatNotify.sql

@@ -0,0 +1,72 @@
+
+/****** Object:  Table [dbo].[CoreCmsUserTocashWeChatNotify]    Script Date: 2025/8/2 0:29:31 ******/
+SET ANSI_NULLS ON
+GO
+
+SET QUOTED_IDENTIFIER ON
+GO
+
+CREATE TABLE [dbo].[CoreCmsUserTocashWeChatNotify](
+	[id] [INT] IDENTITY(1,1) NOT NULL,
+	[callBackId] [NVARCHAR](50) NOT NULL,
+	[create_time] [NVARCHAR](50) NOT NULL,
+	[resource_type] [NVARCHAR](50) NOT NULL,
+	[event_type] [NVARCHAR](50) NOT NULL,
+	[summary] [NVARCHAR](100) NOT NULL,
+	[resource] [NVARCHAR](MAX) NOT NULL,
+	[createTime] [DATETIME] NOT NULL,
+	[wechatpaySerial] [NVARCHAR](100) NULL,
+	[wechatpaySignature] [NVARCHAR](1000) NULL,
+	[wechatpayTimestamp] [NVARCHAR](50) NULL,
+	[wechatpayNonce] [NVARCHAR](100) NULL,
+	[decryptedData] [NVARCHAR](1000) NULL,
+ CONSTRAINT [PK_CoreCmsUserTocashWeChatNotify] PRIMARY KEY CLUSTERED 
+(
+	[id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'<EFBFBD><EFBFBD><EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsUserTocashWeChatNotify', @level2type=N'COLUMN',@level2name=N'id'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֪ͨID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsUserTocashWeChatNotify', @level2type=N'COLUMN',@level2name=N'callBackId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֪ͨ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsUserTocashWeChatNotify', @level2type=N'COLUMN',@level2name=N'create_time'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֪ͨ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsUserTocashWeChatNotify', @level2type=N'COLUMN',@level2name=N'resource_type'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֪ͨ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsUserTocashWeChatNotify', @level2type=N'COLUMN',@level2name=N'event_type'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'<EFBFBD>ص<EFBFBD>ժҪ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsUserTocashWeChatNotify', @level2type=N'COLUMN',@level2name=N'summary'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֪ͨ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsUserTocashWeChatNotify', @level2type=N'COLUMN',@level2name=N'resource'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsUserTocashWeChatNotify', @level2type=N'COLUMN',@level2name=N'createTime'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'<EFBFBD><EFBFBD>ǩ<EFBFBD><EFBFBD>ƽ̨֤<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>кŻ<EFBFBD>֧<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԿID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsUserTocashWeChatNotify', @level2type=N'COLUMN',@level2name=N'wechatpaySerial'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'<EFBFBD><EFBFBD>ǩ<EFBFBD><EFBFBD>ǩ<EFBFBD><EFBFBD>ֵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsUserTocashWeChatNotify', @level2type=N'COLUMN',@level2name=N'wechatpaySignature'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'<EFBFBD><EFBFBD>ǩ<EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsUserTocashWeChatNotify', @level2type=N'COLUMN',@level2name=N'wechatpayTimestamp'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'<EFBFBD><EFBFBD>ǩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsUserTocashWeChatNotify', @level2type=N'COLUMN',@level2name=N'wechatpayNonce'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsUserTocashWeChatNotify', @level2type=N'COLUMN',@level2name=N'decryptedData'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'<EFBFBD>û<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD><EFBFBD><EFBFBD>̼<EFBFBD>ת<EFBFBD><EFBFBD>΢<EFBFBD>Żص<EFBFBD>֪ͨ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsUserTocashWeChatNotify'
+GO
+
+

数据库/SqlServer/20250729/升级脚本/4、新增【用户提现使用商家转账回调记录表】CoreCmsUserTocashWeChatResponse.sql

@@ -0,0 +1,61 @@
+
+
+/****** Object:  Table [dbo].[CoreCmsUserTocashWeChatResponse]    Script Date: 2025/7/29 0:18:07 ******/
+SET ANSI_NULLS ON
+GO
+
+SET QUOTED_IDENTIFIER ON
+GO
+
+CREATE TABLE [dbo].[CoreCmsUserTocashWeChatResponse](
+	[id] [INT] IDENTITY(1,1) NOT NULL,
+	[out_bill_no] [NVARCHAR](50) NOT NULL,
+	[transfer_bill_no] [NVARCHAR](100) NOT NULL,
+	[create_time] [DATETIME] NOT NULL,
+	[state] [NVARCHAR](50) NOT NULL,
+	[package_info] [NVARCHAR](255) NULL,
+	[code] [INT] NULL,
+	[message] [NVARCHAR](255) NULL,
+	[detail] [NVARCHAR](255) NULL,
+	[createTime] [DATETIME] NOT NULL,
+ CONSTRAINT [PK_CoreCmsUserTocashWeChatResponse] PRIMARY KEY CLUSTERED 
+(
+	[id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'<EFBFBD><EFBFBD><EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsUserTocashWeChatResponse', @level2type=N'COLUMN',@level2name=N'id'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'<EFBFBD>̻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsUserTocashWeChatResponse', @level2type=N'COLUMN',@level2name=N'out_bill_no'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'΢<EFBFBD><EFBFBD>ת<EFBFBD>˵<EFBFBD><EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsUserTocashWeChatResponse', @level2type=N'COLUMN',@level2name=N'transfer_bill_no'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'<EFBFBD><EFBFBD><EFBFBD>ݴ<EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsUserTocashWeChatResponse', @level2type=N'COLUMN',@level2name=N'create_time'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'<EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsUserTocashWeChatResponse', @level2type=N'COLUMN',@level2name=N'state'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'<EFBFBD><EFBFBD>ת<EFBFBD><EFBFBD>ȡҳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>package<EFBFBD><EFBFBD>Ϣ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsUserTocashWeChatResponse', @level2type=N'COLUMN',@level2name=N'package_info'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'״̬<EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsUserTocashWeChatResponse', @level2type=N'COLUMN',@level2name=N'code'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'<EFBFBD><EFBFBD>Ϣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsUserTocashWeChatResponse', @level2type=N'COLUMN',@level2name=N'message'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'<EFBFBD><EFBFBD><EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsUserTocashWeChatResponse', @level2type=N'COLUMN',@level2name=N'detail'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD>' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsUserTocashWeChatResponse', @level2type=N'COLUMN',@level2name=N'createTime'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'<EFBFBD>û<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD><EFBFBD><EFBFBD>̼<EFBFBD>ת<EFBFBD>˻ص<EFBFBD><EFBFBD><EFBFBD>¼' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CoreCmsUserTocashWeChatResponse'
+GO
+
+