【优化】移除旧版自定义交易组件。

CoreCms.Net.Services/Bill/CoreCmsBillDeliveryServices.cs

@@ -82,7 +82,7 @@ namespace CoreCms.Net.Services
         /// <param name="shipAreaId">省市区id</param>
         /// <param name="shipAddress">收货地址</param>
         /// <param name="memo">发货描述</param>
-        /// <param name="deliveryCompanyId">直播物流编码</param>
+        /// <param name="deliveryCompanyId">第三方对接物流编码</param>
         /// <returns></returns>
         public async Task<WebApiCallBack> BatchShip(string[] orderId, string logiCode, string logiNo, Dictionary<int, int> items, int storeId = 0, string shipName = "", string shipMobile = "", int shipAreaId = 0, string shipAddress = "", string memo = "", string deliveryCompanyId = "")
         {
@@ -230,7 +230,7 @@ namespace CoreCms.Net.Services
         /// <param name="shipAreaId">省市区id</param>
         /// <param name="shipAddress">收货地址</param>
         /// <param name="memo">发货描述</param>
-        /// <param name="deliveryCompanyId">直播物流编码</param>
+        /// <param name="deliveryCompanyId">第三方对接物流编码</param>
         /// <returns></returns>
         public async Task<WebApiCallBack> Ship(string orderId, string logiCode, string logiNo, Dictionary<int, int> items, int storeId = 0, string shipName = "", string shipMobile = "", int shipAreaId = 0, string shipAddress = "", string memo = "", string deliveryCompanyId = "")
         {

CoreCms.Net.Services/Order/CoreCmsCheckBeforeAddOrderServices.cs

@@ -1,43 +0,0 @@
-/***********************************************************************
- *            Project: CoreCms
- *        ProjectName: 核心内容管理系统                                
- *                Web: https://www.corecms.net                      
- *             Author: 大灰灰                                          
- *              Email: jianweie@163.com                                
- *         CreateTime: 2022/6/29 16:22:45
- *        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 CoreCmsCheckBeforeAddOrderServices : BaseServices<CoreCmsCheckBeforeAddOrder>, ICoreCmsCheckBeforeAddOrderServices
-    {
-        private readonly ICoreCmsCheckBeforeAddOrderRepository _dal;
-        private readonly IUnitOfWork _unitOfWork;
-
-        public CoreCmsCheckBeforeAddOrderServices(IUnitOfWork unitOfWork, ICoreCmsCheckBeforeAddOrderRepository dal)
-        {
-            this._dal = dal;
-            base.BaseDal = dal;
-            _unitOfWork = unitOfWork;
-        }
-
-    }
-}

CoreCms.Net.Services/Order/CoreCmsOrderServices.cs

@@ -31,7 +31,6 @@ using CoreCms.Net.Model.ViewModels.UI;
 using CoreCms.Net.Utility.Extensions;
 using CoreCms.Net.Utility.Helper;
 using CoreCms.Net.WeChat.Service.HttpClients;
-using CoreCms.Net.WeChat.Service.TransactionComponent.Enum;
 using Microsoft.AspNetCore.Http;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -80,9 +79,6 @@ namespace CoreCms.Net.Services
         private readonly ICoreCmsPromotionRecordServices _promotionRecordServices;
         private readonly IRedisOperationRepository _redisOperationRepository;
         private readonly ICoreCmsUserWeChatInfoServices _userWeChatInfoServices;
-        private readonly IWeChatTransactionComponentOrderServices _tcOrderServices;
-        private readonly ICoreCmsCheckBeforeAddOrderServices _checkBeforeAddOrderServices;
-        private readonly IWeChatTransactionComponentOrderServices _chatTransactionComponentOrderServices;
         private readonly WeChat.Service.HttpClients.IWeChatApiHttpClientFactory _weChatApiHttpClientFactory;
 
         private IUnitOfWork _unitOfWork;
@@ -111,7 +107,7 @@ namespace CoreCms.Net.Services
             , ICoreCmsPaymentsServices paymentsServices
             , ICoreCmsBillRefundServices billRefundServices
             , ICoreCmsBillLadingServices billLadingServices
-            , ICoreCmsBillReshipServices billReshipServices, ICoreCmsMessageCenterServices messageCenterServices, ICoreCmsGoodsCommentServices goodsCommentServices, ISysTaskLogServices taskLogServices, ICoreCmsPromotionRecordServices promotionRecordServices, IRedisOperationRepository redisOperationRepository, ICoreCmsUserWeChatInfoServices userWeChatInfoServices, IWeChatTransactionComponentOrderServices tcOrderServices, ICoreCmsCheckBeforeAddOrderServices checkBeforeAddOrderServices, IWeChatApiHttpClientFactory weChatApiHttpClientFactory, IWeChatTransactionComponentOrderServices chatTransactionComponentOrderServices, IUnitOfWork unitOfWork)
+            , ICoreCmsBillReshipServices billReshipServices, ICoreCmsMessageCenterServices messageCenterServices, ICoreCmsGoodsCommentServices goodsCommentServices, ISysTaskLogServices taskLogServices, ICoreCmsPromotionRecordServices promotionRecordServices, IRedisOperationRepository redisOperationRepository, ICoreCmsUserWeChatInfoServices userWeChatInfoServices, IWeChatApiHttpClientFactory weChatApiHttpClientFactory, IUnitOfWork unitOfWork)
         {
             this._dal = dal;
             base.BaseDal = dal;
@@ -146,10 +142,7 @@ namespace CoreCms.Net.Services
             _promotionRecordServices = promotionRecordServices;
             _redisOperationRepository = redisOperationRepository;
             _userWeChatInfoServices = userWeChatInfoServices;
-            _tcOrderServices = tcOrderServices;
-            _checkBeforeAddOrderServices = checkBeforeAddOrderServices;
             _weChatApiHttpClientFactory = weChatApiHttpClientFactory;
-            _chatTransactionComponentOrderServices = chatTransactionComponentOrderServices;
             _unitOfWork = unitOfWork;
         }
 
@@ -290,17 +283,6 @@ namespace CoreCms.Net.Services
                 order.createTime = DateTime.Now;
                 order.scene = scene;
 
-
-                //插入获取的下单前的微信视频号直接数据
-                var check = new CoreCmsCheckBeforeAddOrder();
-                check.orderId = order.orderId;
-                check.requireOrder = requireOrder;
-                check.requiredFundType = requiredFundType;
-                check.traceId = traceId;
-                check.createTime = DateTime.Now;
-
-                await _checkBeforeAddOrderServices.InsertAsync(check);
-
                 //上面保存好订单表，下面保存订单的其他信息
                 if (orderItems == null)
                 {
@@ -473,102 +455,6 @@ namespace CoreCms.Net.Services
                 order.taxTitle = taxName;
                 order.taxCode = taxCode;
 
-
-                if (requireOrder == (int)GlobalEnumVars.RequireOrderType.需要)
-                {
-
-                    //获取小程序认证
-                    var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken();
-                    var client = _weChatApiHttpClientFactory.CreateWxOpenClient();
-
-                    var orderInfo = new ShopOrderAddRequest
-                    {
-                        AccessToken = accessToken,
-                        Scene = scene,
-                        //基础
-                        CreateTime = new DateTimeOffset(DateTime.Now),
-                        //FundType = (int)GlobalEnumVars.RequiredFundType.二级商户号订单,
-                        FundType = (int)GlobalEnumVars.RequiredFundType.二级商户号订单, //新版自定义交易组件，必须要走二级商户订单模式
-                        OutOrderId = order.orderId,
-                        PagePath = UniAppConst.OrderPath(order.orderId)
-                    };
-
-                    var weChatUserInfo = await _userWeChatInfoServices.QueryByClauseAsync(p => p.userId == order.userId, true);
-                    if (weChatUserInfo != null)
-                    {
-                        orderInfo.OpenId = weChatUserInfo.openid;
-                    }
-                    orderInfo.OutUserId = order.userId.ToString();
-
-                    //收货人信息
-                    orderInfo.Address = new ShopOrderAddRequest.Types.Address()
-                    {
-                        ReceiverName = order.shipName,
-                        Detail = order.shipAddress,
-                        TeleNumber = order.shipMobile,
-                    };
-                    //发货方式
-                    orderInfo.Delivery = new ShopOrderAddRequest.Types.Delivery()
-                    {
-                        DeliveryType = (int)DeliveryTypeEnum.正常快递
-                    };
-
-                    orderInfo.OrderDetail = new ShopOrderAddRequest.Types.OrderDetail();
-
-                    //支付信息
-                    orderInfo.OrderDetail.Payment = new ShopOrderAddRequest.Types.OrderDetail.Types.Payment()
-                    {
-                        PayType = (int)GlobalEnumVars.PayMethodType.微信支付
-                    };
-                    //价格体系
-                    orderInfo.OrderDetail.Amount = new ShopOrderAddRequest.Types.OrderDetail.Types.Amount()
-                    {
-                        OrderFee = Convert.ToInt32(order.orderAmount * 100),
-                        FreightFee = Convert.ToInt32(order.costFreight * 100),
-                        DiscountedFee = Convert.ToInt32((order.pointMoney + order.orderDiscountAmount + order.goodsDiscountAmount + order.couponDiscountAmount) * 100),
-                        AdditionalPrice = 0,
-                        AdditionalRemark = "无",
-                    };
-
-                    //商品信息
-                    orderInfo.OrderDetail.ProductList = new List<ShopOrderAddRequest.Types.OrderDetail.Types.Product>();
-
-
-                    foreach (var item in orderItems)
-                    {
-                        orderInfo.OrderDetail.ProductList.Add(new ShopOrderAddRequest.Types.OrderDetail.Types.Product()
-                        {
-                            OutProductId = item.goodsId.ToString(),
-                            OutSKUId = item.productId.ToString(),
-                            Count = item.nums,
-                            SalePrice = Convert.ToInt32(item.amount * 100),
-                            SKURealPrice = Convert.ToInt32(item.amount * 100),
-                            PagePath = UniAppConst.GoodDetail(item.goodsId.ToString()),
-                            Title = item.name,
-                            HeadImageUrl = item.imageUrl
-                        });
-                    }
-
-                    var shopOrderAddResponse = await client.ExecuteShopOrderAddAsync(orderInfo);
-                    if (shopOrderAddResponse.IsSuccessful())
-                    {
-                        var tcOrder = new WeChatTransactionComponentOrder
-                        {
-                            orderId = shopOrderAddResponse.Data.OrderId,
-                            outOrderId = shopOrderAddResponse.Data.OutOrderId,
-                            createTime = DateTime.Now,
-                            openid = orderInfo.OpenId
-                        };
-                        await _chatTransactionComponentOrderServices.InsertAsync(tcOrder);
-                        NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.Order, "自定义交易组件", "推送自定义交易组件创建订单成功");
-                    }
-                    else
-                    {
-                        NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.Order, "自定义交易组件 ", "推送自定义交易组件创建订单失败");
-                    }
-                    jm.otherData = shopOrderAddResponse;
-                }
-
                 //发送消息
                 //0元订单记录支付成功
                 if (order.orderAmount <= 0)
@@ -1047,9 +933,6 @@ namespace CoreCms.Net.Services
                 };
             }
 
-            order.tcOrder = await _tcOrderServices.QueryByClauseAsync(p => p.outOrderId == order.orderId);
-
-
             jm.status = true;
             jm.data = order;
             jm.msg = GlobalConstVars.GetDataSuccess;
@@ -1693,9 +1576,6 @@ namespace CoreCms.Net.Services
                     _goodsServices.ChangeStock(item.productId, GlobalEnumVars.OrderChangeStockType.cancel.ToString(), item.nums);
                 }
 
-                var orderInfoIds = orderInfo.Select(p => p.orderId).ToList();
-                await CloseOrder(orderInfoIds);
-
                 jm.status = true;
                 jm.msg = "订单取消成功";
             }
@@ -2093,7 +1973,7 @@ namespace CoreCms.Net.Services
         /// <param name="memo">发货描述</param>
         /// <param name="storeId">店铺收货地址</param>
         /// <param name="shipAreaId">省市区id</param>
-        /// <param name="deliveryCompanyId">直播物流编码</param>
+        /// <param name="deliveryCompanyId">第三方对接物流编码</param>
         /// <returns></returns>
         public async Task<WebApiCallBack> BatchShip(string[] ids, string logiCode, string logiNo,
             Dictionary<int, int> items, string shipName, string shipMobile, string shipAddress, string memo, int storeId = 0, int shipAreaId = 0, string deliveryCompanyId = "")
@@ -2120,7 +2000,7 @@ namespace CoreCms.Net.Services
         /// <param name="memo">发货描述</param>
         /// <param name="storeId">店铺收货地址</param>
         /// <param name="shipAreaId">省市区id</param>
-        /// <param name="deliveryCompanyId">直播物流编码</param>
+        /// <param name="deliveryCompanyId">第三方对接物流编码</param>
         /// <returns></returns>
         public async Task<WebApiCallBack> Ship(string orderId, string logiCode, string logiNo,
             Dictionary<int, int> items, string shipName, string shipMobile, string shipAddress, string memo, int storeId = 0, int shipAreaId = 0, string deliveryCompanyId = "")
@@ -2393,11 +2273,8 @@ namespace CoreCms.Net.Services
             {
                 var ids = orderInfos.Select(p => p.orderId).ToArray();
                 jm = await CancelOrder(ids);
-
-                await CloseOrder(ids.ToList());
             }
 
-
             //插入日志
             var model = new SysTaskLog
             {
@@ -2645,45 +2522,5 @@ namespace CoreCms.Net.Services
         }
         #endregion
 
-        #region 自定义交易组件-关闭订单
-
-        private async Task CloseOrder(ICollection<string> ids)
-        {
-
-            //判断是否是自定义交易订单
-            var coreCmsCheckBeforeAddOrders = await _checkBeforeAddOrderServices.QueryListByClauseAsync(p => ids.Contains(p.orderId) && p.requireOrder == (int)GlobalEnumVars.RequireOrderType.需要);
-            if (coreCmsCheckBeforeAddOrders.Any())
-            {
-                var dataIds = coreCmsCheckBeforeAddOrders.Select(p => p.orderId).ToList();
-                var orderInfos = await _dal.QueryListByClauseAsync(p => dataIds.Contains(p.orderId), p => p.createTime, OrderByType.Asc, true);
-
-                //获取小程序认证
-                var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken();
-                var client = _weChatApiHttpClientFactory.CreateWxOpenClient();
-
-
-                foreach (var item in orderInfos)
-                {
-                    var request = new ShopOrderCloseRequest();
-                    request.AccessToken = accessToken;
-                    request.OutOrderId = item.orderId;
-
-                    var user = await _userWeChatInfoServices.QueryByClauseAsync(p => p.userId == item.userId);
-                    if (user == null)
-                    {
-                        break;
-                    }
-                    request.OutOrderId = item.orderId;
-                    request.OpenId = user.openid;
-
-                    var response = await client.ExecuteShopOrderCloseAsync(request);
-                    NLogUtil.WriteAll(response.IsSuccessful() ? NLog.LogLevel.Info : NLog.LogLevel.Error,
-                        LogType.Web, "自定义交易组件-关闭订单", JsonConvert.SerializeObject(response));
-                }
-            }
-        }
-
-        #endregion
-
     }
 }

CoreCms.Net.Services/Pay/WeChatPayServices.cs

@@ -71,241 +71,170 @@ namespace CoreCms.Net.Services
         /// <returns></returns>
         public async Task<WebApiCallBack> PubPay(CoreCmsBillPayments entity)
         {
-            using var container = _serviceProvider.CreateScope();
-            var orderServices = container.ServiceProvider.GetService<ICoreCmsOrderServices>();
-            var billPaymentsServices = container.ServiceProvider.GetService<ICoreCmsBillPaymentsServices>();
-            var checkBeforeAddOrderServices = container.ServiceProvider.GetService<ICoreCmsCheckBeforeAddOrderServices>();
-            var transactionComponentOrderServices = container.ServiceProvider.GetService<IWeChatTransactionComponentOrderServices>();
-
             var jm = new WebApiCallBack();
 
-            var payment = await billPaymentsServices.QueryByClauseAsync(p => p.paymentId == entity.paymentId);
-            var checkBeforeAddOrder = await checkBeforeAddOrderServices.QueryByClauseAsync(p => p.orderId == payment.sourceId);
-            if (checkBeforeAddOrder is { requireOrder: (int)GlobalEnumVars.RequireOrderType.需要 })
+            var tradeType = GlobalEnumVars.WeiChatPayTradeType.JSAPI.ToString();
+            if (!string.IsNullOrEmpty(entity.parameters))
             {
-                var order = await transactionComponentOrderServices.QueryByClauseAsync(p => p.outOrderId == payment.sourceId);
+                var jObj = (JObject)JsonConvert.DeserializeObject(entity.parameters);
+                if (jObj != null && jObj.TryGetValue("trade_type", out var value))
+                    tradeType = PayHelper.GetWeiChatPayTradeType(value.ObjectToString());
+            }
 
-                //获取小程序认证
-                var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken();
-                var client = _weChatApiHttpClientFactory.CreateWxOpenClient();
+            var config = await _weChatPayConfigServices.QueryByClauseAsync(p => p.isDefault == true && p.isEnable == true && p.appType == tradeType);
+            if (config == null)
+            {
+                jm.msg = "支付配置信息获取失败";
+                return jm;
+            }
 
-                var getPaymentParameters = new ShopOrderGetPaymentParametersRequest
+            if (string.IsNullOrEmpty(config.notifyUrl))
+            {
+                jm.msg = "未获取到配置的通知地址";
+                return jm;
+            }
+
+            //构建linkPay请求配置实体
+            var payOptions = new WeChatPayOptions
+            {
+                AppId = config.appId,
+                MchId = config.mchId,
+                APIKey = config.apiKey,
+                APIv3Key = config.apiV3Key,
+                Certificate = config.certificate,
+                RsaPublicKey = config.rsaPublicKey,
+                SubAppId = config.subAppId,
+                SubMchId = config.subMchId
+            };
+
+            var openId = string.Empty;
+            if (tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI.ToString() || tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI_OFFICIAL.ToString())
+            {
+                var type = tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI.ToString()
+                    ? (int)GlobalEnumVars.UserAccountTypes.微信小程序
+                    : (int)GlobalEnumVars.UserAccountTypes.微信公众号;
+
+                var user = await _userWeChatInfoServices.QueryByClauseAsync(p => p.userId == _user.ID && p.type == type, p => p.createTime, OrderByType.Desc);
+                if (user == null)
                 {
-                    AccessToken = accessToken,
-                    OpenId = order.openid,
-                    OrderId = order.orderId,
-                    OutOrderId = order.outOrderId
-                };
+                    jm.msg = "微信用户信息获取失败";
+                    return jm;
+                }
 
-                var shopOrderGetPayment = await client.ExecuteShopOrderGetPaymentParametersAsync(getPaymentParameters);
-                if (shopOrderGetPayment.IsSuccessful())
+
+                openId = user.openid;
+            }
+
+            var notifyUrl = config.notifyUrl.EndsWith("/") ? config.notifyUrl + "m-" + config.appId : config.notifyUrl + "/m-" + config.appId;
+
+
+            var orderRequest = new WeChatPayUnifiedOrderRequest
+            {
+                Body = entity.payTitle.Length > 40 ? entity.payTitle[..40] : entity.payTitle,
+                OutTradeNo = entity.paymentId,
+                TotalFee = Convert.ToInt32(entity.money * 100),
+                SpBillCreateIp = entity.ip,
+                NotifyUrl = notifyUrl,
+                TradeType = tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI_OFFICIAL.ToString() ? GlobalEnumVars.WeiChatPayTradeType.JSAPI.ToString() : tradeType,
+                //OpenId = openId
+            };
+
+            if (tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI.ToString() || tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI_OFFICIAL.ToString())
+            {
+                if (!string.IsNullOrEmpty(payOptions.SubMchId))
                 {
-                    jm.data = new
-                    {
-                        shopOrderGetPayment.PaymentParameters,
-                        checkBeforeAddOrder,
-                        entity.paymentId
-                    };
-                    jm.status = true;
-                    await transactionComponentOrderServices.UpdateAsync(p => new WeChatTransactionComponentOrder() { paymentId = entity.paymentId },
-                        p => p.outOrderId == payment.sourceId);
+                    orderRequest.SubOpenId = openId;
                 }
                 else
                 {
-                    jm.status = false;
-                    jm.msg = shopOrderGetPayment.ErrorMessage;
+                    orderRequest.OpenId = openId;
+                }
+            }
+
+            var response = await _client.ExecuteAsync(orderRequest, payOptions);
+            if (response.ReturnCode == WeChatPayCode.Success && response.ResultCode == WeChatPayCode.Success)
+            {
+                //App微信支付
+                if (tradeType == GlobalEnumVars.WeiChatPayTradeType.APP.ToString())
+                {
+                    var reqApp = new WeChatPayAppSdkRequest()
+                    {
+                        PrepayId = response.PrepayId
+                    };
+                    var parameter = await _client.ExecuteAsync(reqApp, payOptions);
+                    parameter.Add("paymentId", entity.paymentId);
+                    jm.status = true;
+                    jm.msg = "创建微信APP支付环境成功";
+                    jm.data = parameter;
+                    jm.otherData = response;
+                }
+                //JsApi通用微信支付
+                else if (tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI.ToString())
+                {
+                    // 将参数(parameter)给 公众号前端 让他在微信内H5调起支付(https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=7_7&index=6)
+                    var req = new WeChatPayJsApiSdkRequest
+                    {
+                        Package = "prepay_id=" + response.PrepayId
+                    };
+                    var parameter = await _client.ExecuteAsync(req, payOptions);
+                    parameter.Add("paymentId", entity.paymentId);
+                    jm.status = true;
+                    jm.msg = "创建JSAPI支付环境成功";
+                    jm.data = parameter;
+                    jm.otherData = response;
+                }
+                //JsApi通用微信支付（和上一样，但是为了区分，单独编写。）
+                else if (tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI_OFFICIAL.ToString())
+                {
+                    // 将参数(parameter)给 公众号前端 让他在微信内H5调起支付(https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=7_7&index=6)
+                    var req = new WeChatPayJsApiSdkRequest
+                    {
+                        Package = "prepay_id=" + response.PrepayId
+                    };
+                    var parameter = await _client.ExecuteAsync(req, payOptions);
+                    parameter.Add("paymentId", entity.paymentId);
+                    jm.status = true;
+                    jm.msg = "创建微信公众号支付环境成功";
+                    jm.data = parameter;
+                    jm.otherData = response;
+                }
+                //扫码支付
+                else if (tradeType == GlobalEnumVars.WeiChatPayTradeType.NATIVE.ToString())
+                {
+                    jm.status = true;
+                    jm.msg = "创建微信扫码支付环境成功";
+                    jm.data = new
+                    {
+                        response,
+                        entity.paymentId
+                    };
+                    //确定是否存在扫码的图片，然后转成base64到前端进行扫码支付
+                    if (!string.IsNullOrEmpty(response.CodeUrl) && response.CodeUrl.Contains("weixin://wxpay/bizpayurl?pr="))
+                    {
+                        using var qrGenerator = new QRCodeGenerator();
+                        using var qrCodeData = qrGenerator.CreateQrCode(response.CodeUrl, QRCodeGenerator.ECCLevel.L);
+                        using var pngByteQrCode = new PngByteQRCode(qrCodeData);
+                        var pngBytes = pngByteQrCode.GetGraphic(20, false);
+                        var stringBase64Str = Convert.ToBase64String(pngBytes);
+                        jm.otherData = stringBase64Str;
+                    }
+                }
+                //H5支付
+                else if (tradeType == GlobalEnumVars.WeiChatPayTradeType.MWEB.ToString())
+                {
+                    jm.status = true;
+                    jm.msg = "创建H5支付环境成功";
+                    jm.data = response;
                 }
-                return jm;
             }
             else
             {
-
-                var tradeType = GlobalEnumVars.WeiChatPayTradeType.JSAPI.ToString();
-                if (!string.IsNullOrEmpty(entity.parameters))
-                {
-                    var jObj = (JObject)JsonConvert.DeserializeObject(entity.parameters);
-                    if (jObj != null && jObj.TryGetValue("trade_type", out var value))
-                        tradeType = PayHelper.GetWeiChatPayTradeType(value.ObjectToString());
-                }
-
-
-                var config = await _weChatPayConfigServices.QueryByClauseAsync(p =>
-                    p.isDefault == true && p.isEnable == true && p.appType == tradeType);
-                if (config == null)
-                {
-                    jm.msg = "支付配置信息获取失败";
-                    return jm;
-                }
-
-                if (string.IsNullOrEmpty(config.notifyUrl))
-                {
-                    jm.msg = "未获取到配置的通知地址";
-                    return jm;
-                }
-
-                //构建linkPay请求配置实体
-                var payOptions = new WeChatPayOptions
-                {
-                    AppId = config.appId,
-                    MchId = config.mchId,
-                    APIKey = config.apiKey,
-                    APIv3Key = config.apiV3Key,
-                    Certificate = config.certificate,
-                    RsaPublicKey = config.rsaPublicKey,
-                    SubAppId = config.subAppId,
-                    SubMchId = config.subMchId
-                };
-
-                var openId = string.Empty;
-                if (tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI.ToString() || tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI_OFFICIAL.ToString())
-                {
-                    //var userAccount = await _userServices.QueryByIdAsync(_user.ID);
-                    //if (userAccount == null)
-                    //{
-                    //    jm.msg = "用户账户获取失败";
-                    //    return jm;
-                    //}
-
-                    //if (userAccount.userWx <= 0)
-                    //{
-                    //    jm.msg = "账户关联微信用户信息获取失败";
-                    //    return jm;
-                    //}
-
-                    //var user = await _userWeChatInfoServices.QueryByClauseAsync(p => p.id == userAccount.userWx);
-                    //if (user == null)
-                    //{
-                    //    jm.msg = "微信用户信息获取失败";
-                    //    return jm;
-                    //}
-
-                    var type = tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI.ToString()
-                        ? (int)GlobalEnumVars.UserAccountTypes.微信小程序
-                        : (int)GlobalEnumVars.UserAccountTypes.微信公众号;
-
-                    var user = await _userWeChatInfoServices.QueryByClauseAsync(p => p.userId == _user.ID && p.type == type, p => p.createTime, OrderByType.Desc);
-                    if (user == null)
-                    {
-                        jm.msg = "微信用户信息获取失败";
-                        return jm;
-                    }
-
-
-                    openId = user.openid;
-                }
-
-                var notifyUrl = config.notifyUrl.EndsWith("/") ? config.notifyUrl + "m-" + config.appId : config.notifyUrl + "/m-" + config.appId;
-
-
-                var orderRequest = new WeChatPayUnifiedOrderRequest
-                {
-                    Body = entity.payTitle.Length > 40 ? entity.payTitle[..40] : entity.payTitle,
-                    OutTradeNo = entity.paymentId,
-                    TotalFee = Convert.ToInt32(entity.money * 100),
-                    SpBillCreateIp = entity.ip,
-                    NotifyUrl = notifyUrl,
-                    TradeType = tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI_OFFICIAL.ToString() ? GlobalEnumVars.WeiChatPayTradeType.JSAPI.ToString() : tradeType,
-                    //OpenId = openId
-                };
-
-                if (tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI.ToString() || tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI_OFFICIAL.ToString())
-                {
-                    if (!string.IsNullOrEmpty(payOptions.SubMchId))
-                    {
-                        orderRequest.SubOpenId = openId;
-                    }
-                    else
-                    {
-                        orderRequest.OpenId = openId;
-                    }
-                }
-
-                var response = await _client.ExecuteAsync(orderRequest, payOptions);
-                if (response.ReturnCode == WeChatPayCode.Success && response.ResultCode == WeChatPayCode.Success)
-                {
-                    //App微信支付
-                    if (tradeType == GlobalEnumVars.WeiChatPayTradeType.APP.ToString())
-                    {
-                        var reqApp = new WeChatPayAppSdkRequest()
-                        {
-                            PrepayId = response.PrepayId
-                        };
-                        var parameter = await _client.ExecuteAsync(reqApp, payOptions);
-                        parameter.Add("paymentId", entity.paymentId);
-                        jm.status = true;
-                        jm.msg = "创建微信APP支付环境成功";
-                        jm.data = parameter;
-                        jm.otherData = response;
-                    }
-                    //JsApi通用微信支付
-                    else if (tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI.ToString())
-                    {
-                        // 将参数(parameter)给 公众号前端 让他在微信内H5调起支付(https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=7_7&index=6)
-                        var req = new WeChatPayJsApiSdkRequest
-                        {
-                            Package = "prepay_id=" + response.PrepayId
-                        };
-                        var parameter = await _client.ExecuteAsync(req, payOptions);
-                        parameter.Add("paymentId", entity.paymentId);
-                        jm.status = true;
-                        jm.msg = "创建JSAPI支付环境成功";
-                        jm.data = parameter;
-                        jm.otherData = response;
-                    }
-                    //JsApi通用微信支付（和上一样，但是为了区分，单独编写。）
-                    else if (tradeType == GlobalEnumVars.WeiChatPayTradeType.JSAPI_OFFICIAL.ToString())
-                    {
-                        // 将参数(parameter)给 公众号前端 让他在微信内H5调起支付(https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=7_7&index=6)
-                        var req = new WeChatPayJsApiSdkRequest
-                        {
-                            Package = "prepay_id=" + response.PrepayId
-                        };
-                        var parameter = await _client.ExecuteAsync(req, payOptions);
-                        parameter.Add("paymentId", entity.paymentId);
-                        jm.status = true;
-                        jm.msg = "创建微信公众号支付环境成功";
-                        jm.data = parameter;
-                        jm.otherData = response;
-                    }
-                    //扫码支付
-                    else if (tradeType == GlobalEnumVars.WeiChatPayTradeType.NATIVE.ToString())
-                    {
-                        jm.status = true;
-                        jm.msg = "创建微信扫码支付环境成功";
-                        jm.data = new
-                        {
-                            response,
-                            entity.paymentId
-                        };
-                        //确定是否存在扫码的图片，然后转成base64到前端进行扫码支付
-                        if (!string.IsNullOrEmpty(response.CodeUrl) && response.CodeUrl.Contains("weixin://wxpay/bizpayurl?pr="))
-                        {
-                            using var qrGenerator = new QRCodeGenerator();
-                            using var qrCodeData = qrGenerator.CreateQrCode(response.CodeUrl, QRCodeGenerator.ECCLevel.L);
-                            using var pngByteQrCode = new PngByteQRCode(qrCodeData);
-                            var pngBytes = pngByteQrCode.GetGraphic(20, false);
-                            var stringBase64Str = Convert.ToBase64String(pngBytes);
-                            jm.otherData = stringBase64Str;
-                        }
-                    }
-                    //H5支付
-                    else if (tradeType == GlobalEnumVars.WeiChatPayTradeType.MWEB.ToString())
-                    {
-                        jm.status = true;
-                        jm.msg = "创建H5支付环境成功";
-                        jm.data = response;
-                    }
-                }
-                else
-                {
-                    jm.status = false;
-                    jm.msg = "微信建立支付请求失败";
-                    jm.otherData = response;
-                    NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.Web, "微信支付失败", JsonConvert.SerializeObject(response));
-                }
-                return jm;
+                jm.status = false;
+                jm.msg = "微信建立支付请求失败";
+                jm.otherData = response;
+                NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.Web, "微信支付失败", JsonConvert.SerializeObject(response));
             }
-
+            return jm;
         }
 
         /// <summary>

CoreCms.Net.Services/WeChat/WeChatTransactionComponentAuditCategoryAuditLogServices.cs

@@ -1,43 +0,0 @@
-/***********************************************************************
- *            Project: CoreCms
- *        ProjectName: 核心内容管理系统                                
- *                Web: https://www.corecms.net                      
- *             Author: 大灰灰                                          
- *              Email: jianweie@163.com                                
- *         CreateTime: 2021/8/1 22:54:37
- *        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 WeChatTransactionComponentAuditCategoryAuditLogServices : BaseServices<WeChatTransactionComponentAuditCategoryAuditLog>, IWeChatTransactionComponentAuditCategoryAuditLogServices
-    {
-        private readonly IWeChatTransactionComponentAuditCategoryAuditLogRepository _dal;
-        private readonly IUnitOfWork _unitOfWork;
-
-        public WeChatTransactionComponentAuditCategoryAuditLogServices(IUnitOfWork unitOfWork, IWeChatTransactionComponentAuditCategoryAuditLogRepository dal)
-        {
-            this._dal = dal;
-            base.BaseDal = dal;
-            _unitOfWork = unitOfWork;
-        }
-
-    }
-}

CoreCms.Net.Services/WeChat/WeChatTransactionComponentAuditCategoryServices.cs

@@ -1,189 +0,0 @@
-/***********************************************************************
- *            Project: CoreCms
- *        ProjectName: 核心内容管理系统                                
- *                Web: https://www.corecms.net                      
- *             Author: 大灰灰                                          
- *              Email: jianweie@163.com                                
- *         CreateTime: 2021/7/14 23:14:23
- *        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;
-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 CoreCms.Net.WeChat.Service.HttpClients;
-using CoreCms.Net.WeChat.Service.TransactionComponent.Enum;
-using SKIT.FlurlHttpClient.Wechat.Api;
-using SKIT.FlurlHttpClient.Wechat.Api.Models;
-using SqlSugar;
-
-
-namespace CoreCms.Net.Services
-{
-    /// <summary>
-    /// 自定义交易组件上传类目资质 接口实现
-    /// </summary>
-    public class WeChatTransactionComponentAuditCategoryServices : BaseServices<WeChatTransactionComponentAuditCategory>, IWeChatTransactionComponentAuditCategoryServices
-    {
-        private readonly IWeChatTransactionComponentAuditCategoryRepository _dal;
-        private readonly IUnitOfWork _unitOfWork;
-        private readonly WeChat.Service.HttpClients.IWeChatApiHttpClientFactory _weChatApiHttpClientFactory;
-
-
-
-
-        public WeChatTransactionComponentAuditCategoryServices(IUnitOfWork unitOfWork, IWeChatTransactionComponentAuditCategoryRepository dal, IWeChatApiHttpClientFactory weChatApiHttpClientFactory)
-        {
-            this._dal = dal;
-            _weChatApiHttpClientFactory = weChatApiHttpClientFactory;
-            base.BaseDal = dal;
-            _unitOfWork = unitOfWork;
-        }
-
-        #region 实现重写增删改查操作==========================================================
-
-        /// <summary>
-        /// 重写异步插入方法
-        /// </summary>
-        /// <param name="entity">实体数据</param>
-        /// <returns></returns>
-        public async Task<AdminUiCallBack> InsertAsync(WeChatTransactionComponentAuditCategory entity)
-        {
-            var jm = new AdminUiCallBack();
-
-            entity.createTime = DateTime.Now;
-
-            var id = await _dal.InsertAsync(entity);
-            var bl = id > 0;
-            jm.code = bl ? 0 : 1;
-            jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure;
-
-
-            if (bl)
-            {
-
-                var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken();
-                var client = _weChatApiHttpClientFactory.CreateWxOpenClient();
-                var request = new ShopAuditAuditCategoryRequest();
-
-                request.AccessToken = accessToken;
-                request.Audit = new ShopAuditAuditCategoryRequest.Types.Audit();
-                request.Audit.LicenseUrl = entity.licenseImage;
-                request.Audit.Category = new ShopAuditAuditCategoryRequest.Types.Audit.Types.Category();
-
-                request.Audit.Category.FirstCategoryId = entity.level1;
-                request.Audit.Category.SecondCategoryId = entity.level2;
-                request.Audit.Category.ThirdCategoryId = entity.level3;
-                request.Audit.Category.CertificateUrlList = entity.certificateImage.Split(",").ToList();
-                //request.Audit.Category.QualificationUrlList = entity.certificateImage.Split(",").ToList();
-
-
-                var response = await client.ExecuteShopAuditAuditCategoryAsync(request);
-                if (response.IsSuccessful())
-                {
-                    await _dal.UpdateAsync(p => new WeChatTransactionComponentAuditCategory()
-                    {
-                        auditId = response.AuditId,
-                        status = (int)AuditEnum.AuditCategoryStatus.审核中
-                    }, p => p.id == id);
-                }
-                else
-                {
-                    jm.code = 1;
-                    jm.msg = response.ErrorMessage;
-
-                }
-            }
-            return jm;
-        }
-
-        /// <summary>
-        /// 重写异步更新方法方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        public async Task<AdminUiCallBack> UpdateAsync(WeChatTransactionComponentAuditCategory 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);
-        }
-
-        #endregion
-
-
-        /// <summary>
-        /// 刷新审核状态
-        /// </summary>
-        /// <param name="entity">实体数据</param>
-        /// <returns></returns>
-        public async Task<AdminUiCallBack> RefreshStatus(WeChatTransactionComponentAuditCategory entity)
-        {
-            var jm = new AdminUiCallBack();
-
-
-            var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken();
-            var client = _weChatApiHttpClientFactory.CreateWxOpenClient();
-            var request = new ShopAuditResultRequest();
-            request.AccessToken = accessToken;
-            request.AuditId = entity.auditId;
-
-
-
-            var response = await client.ExecuteShopAuditResultAsync(request);
-            if (response.IsSuccessful())
-            {
-                await _dal.UpdateAsync(p => new WeChatTransactionComponentAuditCategory()
-                {
-                    status = response.Data.Status,
-                    brandId = (int)response.Data.BrandId,
-                    rejectReason = response.Data.RejectReason
-                }, p => p.id == entity.id);
-            }
-
-
-            jm.code = response.IsSuccessful() ? 0 : 1;
-            jm.msg = response.IsSuccessful() ? "同步成功" : response.ErrorMessage;
-
-            return jm;
-        }
-
-        #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<WeChatTransactionComponentAuditCategory>> QueryPageAsync(Expression<Func<WeChatTransactionComponentAuditCategory, bool>> predicate,
-            Expression<Func<WeChatTransactionComponentAuditCategory, 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/WeChat/WeChatTransactionComponentBrandAuditLogServices.cs

@@ -1,43 +0,0 @@
-/***********************************************************************
- *            Project: CoreCms
- *        ProjectName: 核心内容管理系统                                
- *                Web: https://www.corecms.net                      
- *             Author: 大灰灰                                          
- *              Email: jianweie@163.com                                
- *         CreateTime: 2022/3/21 3:30: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 WeChatTransactionComponentBrandAuditLogServices : BaseServices<WeChatTransactionComponentBrandAuditLog>, IWeChatTransactionComponentBrandAuditLogServices
-    {
-        private readonly IWeChatTransactionComponentBrandAuditLogRepository _dal;
-        private readonly IUnitOfWork _unitOfWork;
-
-        public WeChatTransactionComponentBrandAuditLogServices(IUnitOfWork unitOfWork, IWeChatTransactionComponentBrandAuditLogRepository dal)
-        {
-            this._dal = dal;
-            base.BaseDal = dal;
-            _unitOfWork = unitOfWork;
-        }
-
-    }
-}

CoreCms.Net.Services/WeChat/WeChatTransactionComponentBrandAuditServices.cs

@@ -1,97 +0,0 @@
-/***********************************************************************
- *            Project: CoreCms
- *        ProjectName: 核心内容管理系统                                
- *                Web: https://www.corecms.net                      
- *             Author: 大灰灰                                          
- *              Email: jianweie@163.com                                
- *         CreateTime: 2022/3/20 1:01:47
- *        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 WeChatTransactionComponentBrandAuditServices : BaseServices<WeChatTransactionComponentBrandAudit>, IWeChatTransactionComponentBrandAuditServices
-    {
-        private readonly IWeChatTransactionComponentBrandAuditRepository _dal;
-        private readonly IUnitOfWork _unitOfWork;
-
-        public WeChatTransactionComponentBrandAuditServices(IUnitOfWork unitOfWork, IWeChatTransactionComponentBrandAuditRepository dal)
-        {
-            this._dal = dal;
-            base.BaseDal = dal;
-            _unitOfWork = unitOfWork;
-        }
-
-        #region 实现重写增删改查操作==========================================================
-
-        /// <summary>
-        /// 重写异步插入方法
-        /// </summary>
-        /// <param name="entity">实体数据</param>
-        /// <returns></returns>
-        public async Task<AdminUiCallBack> InsertAsync(WeChatTransactionComponentBrandAudit entity)
-        {
-            return await _dal.InsertAsync(entity);
-        }
-
-        /// <summary>
-        /// 重写异步更新方法方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        public async Task<AdminUiCallBack> UpdateAsync(WeChatTransactionComponentBrandAudit 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);
-        }
-
-        #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<WeChatTransactionComponentBrandAudit>> QueryPageAsync(Expression<Func<WeChatTransactionComponentBrandAudit, bool>> predicate,
-            Expression<Func<WeChatTransactionComponentBrandAudit, 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/WeChat/WeChatTransactionComponentDeliveryCompanyServices.cs

@@ -1,74 +0,0 @@
-/***********************************************************************
- *            Project: CoreCms
- *        ProjectName: 核心内容管理系统                                
- *                Web: https://www.corecms.net                      
- *             Author: 大灰灰                                          
- *              Email: jianweie@163.com                                
- *         CreateTime: 2021/7/11 23:48:58
- *        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 SqlSugar;
-
-
-namespace CoreCms.Net.Services
-{
-    /// <summary>
-    /// 自定义交易组件快递公司 接口实现
-    /// </summary>
-    public class WeChatTransactionComponentDeliveryCompanyServices : BaseServices<WeChatTransactionComponentDeliveryCompany>, IWeChatTransactionComponentDeliveryCompanyServices
-    {
-        private readonly IWeChatTransactionComponentDeliveryCompanyRepository _dal;
-        private readonly IUnitOfWork _unitOfWork;
-
-        public WeChatTransactionComponentDeliveryCompanyServices(IUnitOfWork unitOfWork, IWeChatTransactionComponentDeliveryCompanyRepository dal)
-        {
-            this._dal = dal;
-            base.BaseDal = dal;
-            _unitOfWork = unitOfWork;
-        }
-
-        #region 获取缓存的所有数据==========================================================
-
-        /// <summary>
-        /// 获取缓存的所有数据
-        /// </summary>
-        /// <returns></returns>
-        public async Task<List<WeChatTransactionComponentDeliveryCompany>> 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<WeChatTransactionComponentDeliveryCompany>> QueryPageAsync(Expression<Func<WeChatTransactionComponentDeliveryCompany, bool>> predicate,
-            Expression<Func<WeChatTransactionComponentDeliveryCompany, 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/WeChat/WeChatTransactionComponentGoodAuditLogServices.cs

@@ -1,43 +0,0 @@
-/***********************************************************************
- *            Project: CoreCms
- *        ProjectName: 核心内容管理系统                                
- *                Web: https://www.corecms.net                      
- *             Author: 大灰灰                                          
- *              Email: jianweie@163.com                                
- *         CreateTime: 2021/8/1 22:18:06
- *        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 WeChatTransactionComponentGoodAuditLogServices : BaseServices<WeChatTransactionComponentGoodAuditLog>, IWeChatTransactionComponentGoodAuditLogServices
-    {
-        private readonly IWeChatTransactionComponentGoodAuditLogRepository _dal;
-        private readonly IUnitOfWork _unitOfWork;
-
-        public WeChatTransactionComponentGoodAuditLogServices(IUnitOfWork unitOfWork, IWeChatTransactionComponentGoodAuditLogRepository dal)
-        {
-            this._dal = dal;
-            base.BaseDal = dal;
-            _unitOfWork = unitOfWork;
-        }
-
-    }
-}

CoreCms.Net.Services/WeChat/WeChatTransactionComponentGoodSKUServices.cs

@@ -1,53 +0,0 @@
-/***********************************************************************
- *            Project: CoreCms
- *        ProjectName: 核心内容管理系统                                
- *                Web: https://www.corecms.net                      
- *             Author: 大灰灰                                          
- *              Email: jianweie@163.com                                
- *         CreateTime: 2021/7/5 23:23:30
- *        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>
-    /// 自定义交易组件商品关联sku列表 接口实现
-    /// </summary>
-    public class WeChatTransactionComponentGoodSKUServices : BaseServices<WeChatTransactionComponentGoodSKU>, IWeChatTransactionComponentGoodSKUServices
-    {
-        private readonly IWeChatTransactionComponentGoodSKURepository _dal;
-        private readonly IUnitOfWork _unitOfWork;
-
-        public WeChatTransactionComponentGoodSKUServices(IUnitOfWork unitOfWork, IWeChatTransactionComponentGoodSKURepository dal)
-        {
-            this._dal = dal;
-            base.BaseDal = dal;
-            _unitOfWork = unitOfWork;
-        }
-
-        /// <summary>
-        /// 重写异步更新方法方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        public async Task<AdminUiCallBack> UpdateAsync(List<WeChatTransactionComponentGoodSKU> entity)
-        {
-            return await _dal.UpdateAsync(entity);
-        }
-
-    }
-}

CoreCms.Net.Services/WeChat/WeChatTransactionComponentGoodServices.cs

@@ -1,96 +0,0 @@
-/***********************************************************************
- *            Project: CoreCms
- *        ProjectName: 核心内容管理系统                                
- *                Web: https://www.corecms.net                      
- *             Author: 大灰灰                                          
- *              Email: jianweie@163.com                                
- *         CreateTime: 2021/7/4 1:24:53
- *        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 WeChatTransactionComponentGoodServices : BaseServices<WeChatTransactionComponentGood>, IWeChatTransactionComponentGoodServices
-    {
-        private readonly IWeChatTransactionComponentGoodRepository _dal;
-        private readonly IUnitOfWork _unitOfWork;
-
-        public WeChatTransactionComponentGoodServices(IUnitOfWork unitOfWork, IWeChatTransactionComponentGoodRepository dal)
-        {
-            this._dal = dal;
-            base.BaseDal = dal;
-            _unitOfWork = unitOfWork;
-        }
-
-        #region 实现重写增删改查操作==========================================================
-
-        /// <summary>
-        /// 重写异步插入方法
-        /// </summary>
-        /// <param name="entity">实体数据</param>
-        /// <returns></returns>
-        public async Task<AdminUiCallBack> InsertAsync(WeChatTransactionComponentGood entity)
-        {
-            return await _dal.InsertAsync(entity);
-        }
-
-        /// <summary>
-        /// 重写异步更新方法方法
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <returns></returns>
-        public async Task<AdminUiCallBack> UpdateAsync(WeChatTransactionComponentGood 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);
-        }
-
-        #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<WeChatTransactionComponentGood>> QueryPageAsync(Expression<Func<WeChatTransactionComponentGood, bool>> predicate,
-            Expression<Func<WeChatTransactionComponentGood, 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/WeChat/WeChatTransactionComponentOrderServices.cs

@@ -1,41 +0,0 @@
-/***********************************************************************
- *            Project: CoreCms
- *        ProjectName: 核心内容管理系统                                
- *                Web: https://www.corecms.net                      
- *             Author: 大灰灰                                          
- *              Email: jianweie@163.com                                
- *         CreateTime: 2021/7/10 23:44:16
- *        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 SqlSugar;
-
-
-namespace CoreCms.Net.Services
-{
-    /// <summary>
-    /// 自定义交易组件提交订单 接口实现
-    /// </summary>
-    public class WeChatTransactionComponentOrderServices : BaseServices<WeChatTransactionComponentOrder>, IWeChatTransactionComponentOrderServices
-    {
-        private readonly IWeChatTransactionComponentOrderRepository _dal;
-        private readonly IUnitOfWork _unitOfWork;
-
-        public WeChatTransactionComponentOrderServices(IUnitOfWork unitOfWork, IWeChatTransactionComponentOrderRepository dal)
-        {
-            this._dal = dal;
-            base.BaseDal = dal;
-            _unitOfWork = unitOfWork;
-        }
-
-    }
-}

CoreCms.Net.Services/WeChat/WeChatTransactionComponentThirdCategoryServices.cs

@@ -1,62 +0,0 @@
-/***********************************************************************
- *            Project: CoreCms
- *        ProjectName: 核心内容管理系统                                
- *                Web: https://www.corecms.net                      
- *             Author: 大灰灰                                          
- *              Email: jianweie@163.com                                
- *         CreateTime: 2021/7/3 16:30:55
- *        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 WeChatTransactionComponentThirdCategoryServices : BaseServices<WeChatTransactionComponentThirdCategory>, IWeChatTransactionComponentThirdCategoryServices
-    {
-        private readonly IWeChatTransactionComponentThirdCategoryRepository _dal;
-        private readonly IUnitOfWork _unitOfWork;
-
-        public WeChatTransactionComponentThirdCategoryServices(IUnitOfWork unitOfWork, IWeChatTransactionComponentThirdCategoryRepository dal)
-        {
-            this._dal = dal;
-            base.BaseDal = dal;
-            _unitOfWork = unitOfWork;
-        }
-
-        #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<WeChatTransactionComponentThirdCategory>> QueryPageAsync(Expression<Func<WeChatTransactionComponentThirdCategory, bool>> predicate,
-            Expression<Func<WeChatTransactionComponentThirdCategory, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
-            int pageSize = 20, bool blUseNoLock = false)
-        {
-            return await _dal.QueryPageAsync(predicate, orderByExpression, orderByType, pageIndex, pageSize, blUseNoLock);
-        }
-        #endregion
-
-    }
-}