wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2025-12-06 17:43:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

【优化】移除旧版微信自定义交易组件相关配置常量及定时任务信息。

Browse Source
This commit is contained in:
jianweie code
2023-11-15 15:18:56 +08:00
parent 84f8c5b1e7
commit 1a26d2b9e1
7 changed files with 0 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
CoreCms.Net.Configuration/GlobalConstVars.cs
View File

@@ -404,26 +404,6 @@ namespace CoreCms.Net.Configuration
/// </summary> /// </summary>
public const string SmsQueue = "SmsQueue"; public const string SmsQueue = "SmsQueue";
/// <summary>
/// 微信自定义交易组件-同步订单状态
/// </summary>
public const string TransactionComponentPayOrderSync = "TransactionComponentPayOrderSyncQueue";
/// <summary>
/// 微信自定义交易组件-订单发货
/// </summary>
public const string TransactionComponentOrderShipSync = "TransactionComponentOrderShipSyncQueue";
/// <summary>
/// 微信自定义交易组件-订单确认收货
/// </summary>
public const string TransactionComponentOrderDeliveryRecieveSync = "TransactionComponentOrderDeliveryRecieveSyncQueue";
/// <summary>
/// 微信自定义交易组件-同步创建售后单
/// </summary>
public const string TransactionComponentAfterSaleCreateSync = "TransactionComponentAfterSaleCreateSyncQueue";
//用户相关 //用户相关
//订单支付成功后，用户升级处理 //订单支付成功后，用户升级处理

3
CoreCms.Net.Services/Bill/CoreCmsBillAftersalesServices.cs
View File

@@ -299,9 +299,6 @@ namespace CoreCms.Net.Services
orderInfo.billAftersalesId = afterSalesId; orderInfo.billAftersalesId = afterSalesId;
// 微信自定义交易组件-同步创建售后单
await _redisOperationRepository.ListLeftPushAsync(RedisMessageQueueKey.TransactionComponentAfterSaleCreateSync, JsonConvert.SerializeObject(orderInfo));
jm.status = true; jm.status = true;
jm.data = billAftersales; jm.data = billAftersales;
jm.msg = "售后申请成功！"; jm.msg = "售后申请成功！";

3
CoreCms.Net.Services/Bill/CoreCmsBillDeliveryServices.cs
View File

@@ -343,9 +343,6 @@ namespace CoreCms.Net.Services
//订单更新发货状态，发送各种消息 //订单更新发货状态，发送各种消息
await OrderShip(orderInfo, items, billDelivery, storeId); await OrderShip(orderInfo, items, billDelivery, storeId);
//发货同步处理
await _redisOperationRepository.ListLeftPushAsync(RedisMessageQueueKey.TransactionComponentOrderShipSync, billDelivery.deliveryId);
jm.status = true; jm.status = true;
jm.msg = "发货成功"; jm.msg = "发货成功";

10
CoreCms.Net.Services/Order/CoreCmsOrderServices.cs
View File

@@ -2125,12 +2125,6 @@ namespace CoreCms.Net.Services
//订单完成结算订单 //订单完成结算订单
await _redisOperationRepository.ListLeftPushAsync(RedisMessageQueueKey.OrderFinishCommand, orderInfo.orderId); await _redisOperationRepository.ListLeftPushAsync(RedisMessageQueueKey.OrderFinishCommand, orderInfo.orderId);
if (source == "system")
{
// 微信自定义交易组件-订单确认收货
await _redisOperationRepository.ListLeftPushAsync(RedisMessageQueueKey.TransactionComponentOrderDeliveryRecieveSync, JsonConvert.SerializeObject(orderInfo));
}
jm.status = true; jm.status = true;
jm.msg = "订单完成"; jm.msg = "订单完成";
@@ -2199,10 +2193,6 @@ namespace CoreCms.Net.Services
}; };
await _orderLogServices.InsertAsync(orderLog); await _orderLogServices.InsertAsync(orderLog);
// 微信自定义交易组件-订单确认收货
await _redisOperationRepository.ListLeftPushAsync(RedisMessageQueueKey.TransactionComponentOrderDeliveryRecieveSync, JsonConvert.SerializeObject(orderInfo));
jm.status = true; jm.status = true;
jm.msg = "确认收货成功"; jm.msg = "确认收货成功";

369
CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs
View File

@@ -1949,374 +1949,5 @@ namespace CoreCms.Net.Web.Admin.Controllers
#endregion #endregion
//微信自定义交易组件================================================================
#region 自定义交易组件上传图片====================================================
/// <summary>
/// 自定义交易组件上传图片
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task<AdminUiCallBack> 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)====================================================
/// <summary>
/// 自定义交易组件上传图片(Base64)
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task<AdminUiCallBack> 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交换)====================================================
/// <summary>
/// 自定义交易组件上传图片(Url交换)
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task<AdminUiCallBack> 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交换)====================================================
/// <summary>
/// 自定义交易组件上传图片(Url交换)
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task<AdminUiCallBack> 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交换单张)====================================================
/// <summary>
/// 自定义交易组件上传图片(Url交换单张)
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task<AdminUiCallBack> 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 （微信小程序）新增临时素材====================================================
/// <summary>
/// （微信小程序）新增临时素材
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task<AdminUiCallBack> 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
} }
} }

4
CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs
View File

@@ -1737,10 +1737,6 @@ namespace CoreCms.Net.Web.Admin.Controllers
return jm; return jm;
} }
//发货同步处理
await _redisOperationRepository.ListLeftPushAsync(RedisMessageQueueKey.TransactionComponentOrderShipSync, delivery.deliveryId);
jm.code = 0; jm.code = 0;
jm.msg = "提交任务成功,请核实远端状态"; jm.msg = "提交任务成功,请核实远端状态";

36
CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml
View File

@@ -921,42 +921,6 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.ToolsController.MiNiShopOpenComponent2_UploadImg">
<summary>
自定义交易组件上传图片
</summary>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.ToolsController.MiNiShopOpenComponent2_UploadImgByBase64(CoreCms.Net.Model.FromBody.FMBase64Post)">
<summary>
自定义交易组件上传图片(Base64)
</summary>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.ToolsController.MiNiShopOpenComponent2_UploadImgByUrl(CoreCms.Net.Model.FromBody.FMStringId)">
<summary>
自定义交易组件上传图片(Url交换)
</summary>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.ToolsController.MiNiShopOpenComponent2_UploadImgByUrlArr(CoreCms.Net.Model.FromBody.FMArrayStringIds)">
<summary>
自定义交易组件上传图片(Url交换)
</summary>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.ToolsController.MiNiShopOpenComponent2_UploadImgByUrlSingle(CoreCms.Net.Model.FromBody.FMStringId)">
<summary>
自定义交易组件上传图片(Url交换单张)
</summary>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.ToolsController.New_Temporary_Materials_UploadImg">
<summary>
（微信小程序）新增临时素材
</summary>
<returns></returns>
</member>
<member name="T:CoreCms.Net.Web.Admin.Controllers.CoreCmsDistributionController"> <member name="T:CoreCms.Net.Web.Admin.Controllers.CoreCmsDistributionController">
<summary> <summary>
分销商表 分销商表