From 1a26d2b9e190510e9e3b8a4c2ce2356f6c269c22 Mon Sep 17 00:00:00 2001 From: jianweie code Date: Wed, 15 Nov 2023 15:18:56 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E6=97=A7=E7=89=88=E5=BE=AE=E4=BF=A1=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E4=BA=A4=E6=98=93=E7=BB=84=E4=BB=B6=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=B8=B8=E9=87=8F=E5=8F=8A=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BF=A1=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CoreCms.Net.Configuration/GlobalConstVars.cs | 20 - .../Bill/CoreCmsBillAftersalesServices.cs | 3 - .../Bill/CoreCmsBillDeliveryServices.cs | 3 - .../Order/CoreCmsOrderServices.cs | 10 - .../Controllers/Com/ToolsController.cs | 369 ------------------ .../Order/CoreCmsOrderController.cs | 4 - .../CoreCms.Net.Web.Admin.xml | 36 -- 7 files changed, 445 deletions(-) diff --git a/CoreCms.Net.Configuration/GlobalConstVars.cs b/CoreCms.Net.Configuration/GlobalConstVars.cs index cb2ec660..e41fe781 100644 --- a/CoreCms.Net.Configuration/GlobalConstVars.cs +++ b/CoreCms.Net.Configuration/GlobalConstVars.cs @@ -404,26 +404,6 @@ namespace CoreCms.Net.Configuration /// public const string SmsQueue = "SmsQueue"; - - - /// - /// 微信自定义交易组件-同步订单状态 - /// - public const string TransactionComponentPayOrderSync = "TransactionComponentPayOrderSyncQueue"; - /// - /// 微信自定义交易组件-订单发货 - /// - public const string TransactionComponentOrderShipSync = "TransactionComponentOrderShipSyncQueue"; - /// - /// 微信自定义交易组件-订单确认收货 - /// - public const string TransactionComponentOrderDeliveryRecieveSync = "TransactionComponentOrderDeliveryRecieveSyncQueue"; - /// - /// 微信自定义交易组件-同步创建售后单 - /// - public const string TransactionComponentAfterSaleCreateSync = "TransactionComponentAfterSaleCreateSyncQueue"; - - //用户相关 //订单支付成功后，用户升级处理 diff --git a/CoreCms.Net.Services/Bill/CoreCmsBillAftersalesServices.cs b/CoreCms.Net.Services/Bill/CoreCmsBillAftersalesServices.cs index 02da8a5b..5ea24607 100644 --- a/CoreCms.Net.Services/Bill/CoreCmsBillAftersalesServices.cs +++ b/CoreCms.Net.Services/Bill/CoreCmsBillAftersalesServices.cs @@ -299,9 +299,6 @@ namespace CoreCms.Net.Services orderInfo.billAftersalesId = afterSalesId; - // 微信自定义交易组件-同步创建售后单 - await _redisOperationRepository.ListLeftPushAsync(RedisMessageQueueKey.TransactionComponentAfterSaleCreateSync, JsonConvert.SerializeObject(orderInfo)); - jm.status = true; jm.data = billAftersales; jm.msg = "售后申请成功！"; diff --git a/CoreCms.Net.Services/Bill/CoreCmsBillDeliveryServices.cs b/CoreCms.Net.Services/Bill/CoreCmsBillDeliveryServices.cs index 17ca2225..fb5649ab 100644 --- a/CoreCms.Net.Services/Bill/CoreCmsBillDeliveryServices.cs +++ b/CoreCms.Net.Services/Bill/CoreCmsBillDeliveryServices.cs @@ -343,9 +343,6 @@ namespace CoreCms.Net.Services //订单更新发货状态，发送各种消息 await OrderShip(orderInfo, items, billDelivery, storeId); - //发货同步处理 - await _redisOperationRepository.ListLeftPushAsync(RedisMessageQueueKey.TransactionComponentOrderShipSync, billDelivery.deliveryId); - jm.status = true; jm.msg = "发货成功"; diff --git a/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs b/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs index f0b7ab70..18a9a998 100644 --- a/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs +++ b/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs @@ -2125,12 +2125,6 @@ namespace CoreCms.Net.Services //订单完成结算订单 await _redisOperationRepository.ListLeftPushAsync(RedisMessageQueueKey.OrderFinishCommand, orderInfo.orderId); - if (source == "system") - { - // 微信自定义交易组件-订单确认收货 - await _redisOperationRepository.ListLeftPushAsync(RedisMessageQueueKey.TransactionComponentOrderDeliveryRecieveSync, JsonConvert.SerializeObject(orderInfo)); - } - jm.status = true; jm.msg = "订单完成"; @@ -2199,10 +2193,6 @@ namespace CoreCms.Net.Services }; await _orderLogServices.InsertAsync(orderLog); - - // 微信自定义交易组件-订单确认收货 - await _redisOperationRepository.ListLeftPushAsync(RedisMessageQueueKey.TransactionComponentOrderDeliveryRecieveSync, JsonConvert.SerializeObject(orderInfo)); - jm.status = true; jm.msg = "确认收货成功"; diff --git a/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs b/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs index 11565f35..f2fcbb1d 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs @@ -1949,374 +1949,5 @@ namespace CoreCms.Net.Web.Admin.Controllers #endregion - //微信自定义交易组件================================================================ - - #region 自定义交易组件上传图片==================================================== - - /// - /// 自定义交易组件上传图片 - /// - /// - [HttpPost] - public async Task MiNiShopOpenComponent2_UploadImg() - { - var jm = new AdminUiCallBack(); - - var filesStorageOptions = await _coreCmsSettingServices.GetFilesStorageOptions(); - //初始化上传参数 - var maxSize = 1024 * 1024 * filesStorageOptions.MaxSize; //上传大小5M - - var file = Request.Form.Files["file"]; - if (file == null) - { - jm.msg = "请选择文件"; - return jm; - } - var fileName = file.FileName; - var fileExt = Path.GetExtension(fileName).ToLowerInvariant(); - - //检查大小 - if (file.Length > maxSize) - { - jm.msg = "上传文件大小超过限制，最大允许上传" + filesStorageOptions.MaxSize + "M"; - return jm; - } - - //检查文件扩展名 - if (string.IsNullOrEmpty(fileExt) || Array.IndexOf(filesStorageOptions.FileTypes.Split(','), fileExt.Substring(1).ToLower()) == -1) - { - jm.msg = "上传文件扩展名是不允许的扩展名,请上传后缀名为：" + filesStorageOptions.FileTypes; - return jm; - } - - byte[] bytes; - await using (var ms = new MemoryStream()) - { - await file.CopyToAsync(ms); - bytes = ms.ToArray(); - } - - var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken(); - var client = _weChatApiHttpClientFactory.CreateWxOpenClient(); - var request = new ShopImageUploadRequest(); - request.AccessToken = accessToken; - request.ImageFileBytes = bytes; - request.ResponseType = 1; - - var response = await client.ExecuteShopImageUploadAsync(request); - if (response.IsSuccessful()) - { - jm.code = 0; - jm.msg = "上传成功!"; - jm.data = new - { - fileUrl = response.Image.TempImageUrl, - src = response.Image.TempImageUrl - }; - } - else - { - jm.code = 1; - jm.msg = response.ErrorMessage; - } - jm.otherData = response; - - return jm; - } - - #endregion - - #region 自定义交易组件上传图片(Base64)==================================================== - - /// - /// 自定义交易组件上传图片(Base64) - /// - /// - [HttpPost] - public async Task MiNiShopOpenComponent2_UploadImgByBase64([FromBody] FMBase64Post entity) - { - var jm = new AdminUiCallBack(); - - - var filesStorageOptions = await _coreCmsSettingServices.GetFilesStorageOptions(); - - if (string.IsNullOrEmpty(entity.base64)) - { - jm.msg = "请上传合法内容"; - return jm; - } - - entity.base64 = entity.base64.Replace("data:image/png;base64,", "").Replace("data:image/jgp;base64,", "").Replace("data:image/jpg;base64,", "").Replace("data:image/jpeg;base64,", "");//将base64头部信息替换 - byte[] bytes = Convert.FromBase64String(entity.base64); - - var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken(); - var client = _weChatApiHttpClientFactory.CreateWxOpenClient(); - var request = new ShopImageUploadRequest(); - request.AccessToken = accessToken; - request.ImageFileBytes = bytes; - request.ResponseType = 1; - - var response = await client.ExecuteShopImageUploadAsync(request); - if (response.IsSuccessful()) - { - jm.code = 0; - jm.msg = "上传成功!"; - jm.data = new - { - fileUrl = response.Image.TempImageUrl, - src = response.Image.TempImageUrl - }; - } - else - { - jm.code = 1; - jm.msg = response.ErrorMessage; - } - jm.otherData = response; - - return jm; - } - - #endregion - - #region 自定义交易组件上传图片(Url交换)==================================================== - - /// - /// 自定义交易组件上传图片(Url交换) - /// - /// - [HttpPost] - public async Task MiNiShopOpenComponent2_UploadImgByUrl([FromBody] FMStringId entity) - { - var jm = new AdminUiCallBack(); - - var filesStorageOptions = await _coreCmsSettingServices.GetFilesStorageOptions(); - - if (string.IsNullOrEmpty(entity.id)) - { - jm.msg = "请提交合法图片地址"; - return jm; - } - - var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken(); - var client = _weChatApiHttpClientFactory.CreateWxOpenClient(); - var request = new ShopImageUploadRequest(); - request.AccessToken = accessToken; - request.ImageUrl = entity.id; - request.ResponseType = 1; - - var response = await client.ExecuteShopImageUploadAsync(request); - if (response.IsSuccessful()) - { - jm.code = 0; - jm.msg = "上传成功!"; - jm.data = new - { - fileUrl = response.Image.TempImageUrl, - src = response.Image.TempImageUrl - }; - } - else - { - jm.code = 1; - jm.msg = response.ErrorMessage; - } - jm.otherData = response; - - return jm; - } - - #endregion - - #region 自定义交易组件上传图片(Url交换)==================================================== - - /// - /// 自定义交易组件上传图片(Url交换) - /// - /// - [HttpPost] - public async Task MiNiShopOpenComponent2_UploadImgByUrlArr([FromBody] FMArrayStringIds entity) - { - var jm = new AdminUiCallBack(); - - var filesStorageOptions = await _coreCmsSettingServices.GetFilesStorageOptions(); - - if (entity.id.Length <= 0) - { - jm.msg = "请提交合法图片地址"; - return jm; - } - - var urlArr = new String[] { "store.mp.video.tencent-cloud.com", "mmbizurl.cn", "mmecimage.cn" }; - - var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken(); - var client = _weChatApiHttpClientFactory.CreateWxOpenClient(); - - for (var index = 0; index < entity.id.Length; index++) - { - var img = entity.id[index]; - if (img.Contains(urlArr[0]) || img.Contains(urlArr[1]) || img.Contains(urlArr[2])) - { - continue; - } - else - { - var request = new ShopImageUploadRequest(); - request.AccessToken = accessToken; - request.ImageUrl = img; - request.ResponseType = 1; - - var response = await client.ExecuteShopImageUploadAsync(request); - if (response.IsSuccessful()) - { - entity.id[index] = response.Image.TempImageUrl; - } - } - } - - jm.code = 0; - jm.msg = "同步成功"; - jm.data = entity.id; - - return jm; - } - - #endregion - - #region 自定义交易组件上传图片(Url交换单张)==================================================== - - /// - /// 自定义交易组件上传图片(Url交换单张) - /// - /// - [HttpPost] - public async Task MiNiShopOpenComponent2_UploadImgByUrlSingle([FromBody] FMStringId entity) - { - var jm = new AdminUiCallBack(); - - var filesStorageOptions = await _coreCmsSettingServices.GetFilesStorageOptions(); - - if (string.IsNullOrEmpty(entity.id)) - { - jm.msg = "请提交合法图片地址"; - return jm; - } - - var urlArr = new String[] { "store.mp.video.tencent-cloud.com", "mmbizurl.cn", "mmecimage.cn" }; - - var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken(); - var client = _weChatApiHttpClientFactory.CreateWxOpenClient(); - - if (entity.id.Contains(urlArr[0]) || entity.id.Contains(urlArr[1]) || entity.id.Contains(urlArr[2])) - { - jm.msg = "合法图片，无需同步"; - return jm; - } - else - { - var request = new ShopImageUploadRequest(); - request.AccessToken = accessToken; - request.ImageUrl = entity.id; - request.ResponseType = 1; - - var response = await client.ExecuteShopImageUploadAsync(request); - if (response.IsSuccessful()) - { - jm.code = 0; - jm.msg = "同步成功"; - jm.data = response.Image.TempImageUrl; - } - else - { - jm.code = 1; - jm.msg = "同步失败" + response.ErrorMessage; - } - } - - return jm; - } - - #endregion - - #region （微信小程序）新增临时素材==================================================== - - /// - /// （微信小程序）新增临时素材 - /// - /// - [HttpPost] - public async Task New_Temporary_Materials_UploadImg() - { - var jm = new AdminUiCallBack(); - - var filesStorageOptions = await _coreCmsSettingServices.GetFilesStorageOptions(); - //初始化上传参数 - var maxSize = 1024 * 1024 * filesStorageOptions.MaxSize; //上传大小5M - - var file = Request.Form.Files["file"]; - if (file == null) - { - jm.msg = "请选择文件"; - return jm; - } - var fileName = file.FileName; - var fileExt = Path.GetExtension(fileName).ToLowerInvariant(); - - //检查大小 - if (file.Length > maxSize) - { - jm.msg = "上传文件大小超过限制，最大允许上传" + filesStorageOptions.MaxSize + "M"; - return jm; - } - - //检查文件扩展名 - if (string.IsNullOrEmpty(fileExt) || Array.IndexOf(filesStorageOptions.FileTypes.Split(','), fileExt.Substring(1).ToLower()) == -1) - { - jm.msg = "上传文件扩展名是不允许的扩展名,请上传后缀名为：" + filesStorageOptions.FileTypes; - return jm; - } - - byte[] bytes; - await using (var ms = new MemoryStream()) - { - await file.CopyToAsync(ms); - bytes = ms.ToArray(); - } - - var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken(); - var client = _weChatApiHttpClientFactory.CreateWxOpenClient(); - var request = new CgibinMediaUploadRequest - { - AccessToken = accessToken, - FileBytes = bytes, - FileContentType = file.ContentType, - FileName = file.FileName, - Type = "image" - }; - - var response = await client.ExecuteCgibinMediaUploadAsync(request); - if (response.IsSuccessful()) - { - jm.code = 0; - jm.msg = "上传成功!"; - jm.data = new - { - response.CreateTimestamp, - response.MediaId, - response.Type - }; - } - else - { - jm.code = 1; - jm.msg = response.ErrorMessage; - } - jm.otherData = response; - - return jm; - } - - #endregion - } } \ No newline at end of file diff --git a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs index c19e102e..8225b29a 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs @@ -1737,10 +1737,6 @@ namespace CoreCms.Net.Web.Admin.Controllers return jm; } - //发货同步处理 - await _redisOperationRepository.ListLeftPushAsync(RedisMessageQueueKey.TransactionComponentOrderShipSync, delivery.deliveryId); - - jm.code = 0; jm.msg = "提交任务成功,请核实远端状态"; diff --git a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml index 8343d07f..589fcacc 100644 --- a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml +++ b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml @@ -921,42 +921,6 @@ - - - 自定义交易组件上传图片 - - - - - - 自定义交易组件上传图片(Base64) - - - - - - 自定义交易组件上传图片(Url交换) - - - - - - 自定义交易组件上传图片(Url交换) - - - - - - 自定义交易组件上传图片(Url交换单张) - - - - - - （微信小程序）新增临时素材 - - - 分销商表