mirror of
http://git.coreshop.cn/jianweie/coreshoppro.git
synced 2025-12-06 16:13:26 +08:00
### 0.6.0 专业版(大版本升级,破坏性升级,请酌情处理):
【新增】弃用现在sku前端,启用全新sku组件,更加灵活,体验更好。 【新增】新增通过商品序列获取sku全新列表功能。 【新增】仓储层底层增加二级缓存功能,后面将逐步完善底层缓存中心模块。 【新增】0元购,积分兑换模式下,也去计算用户是否科技升级。 【新增】数据及业务仓储增加二级缓存功能。curd可自主控制是否缓存和清除。 【新增】订单导出excel数据增加商品名称+货品sku组合展示的方式。 【新增】自定义交易组件增加【获取商家信息】【更新商家信息】两个接口处理。 【新增】增加公告列表及公告详情页面,首页组件公告点击跳转列表展示。 【新增】个人中心增加【公告中心】入口。 【新增】后台余额变动增加说明录入。 【调整】将前端能进行分包的文件夹都进行分包,减少主包占用,方便进行二开。 【调整】因ckeditor5存在图片不可设置宽度,上传不支持mp4,排版不畅等情况,降级使用ckeditor4版本。 【修复】修复0.5.5版本售后积分返还机制积分模式判断异常的问题。 【修复】修复使用积分全额抵扣,或其他优惠政策导致的0元购,未进行短信提醒及小票打印机未打印的问题。 【修复】修复更换ckeditor4编辑器后接龙添加编辑调用失败的问题。 【修复】修复积分全额抵扣,金额0元购的情况下,进行售后执行完毕,订单未完结的情况。 【优化】去除分销申请面板按钮无用并失效报错的customStyle属性。 【优化】优化部分方法中使用手写字符串的遗留问题,统一采用enum方式。 【优化】优化前端及接口部分命名错误的问题。错将skill误写成seckill。 【优化】去除uniapp端多个客服代码。 【优化】商品详情底部完善购物车数量显示的问题。 【优化】优化团购列表,拼团列表,秒杀页面页面样式布局差异问题。 【优化】调整支付结果界面样式效果,仿微信支付结果界面。更加清晰明朗。 【优化】优化售后提交页面json计算,开放当用户下单后但未发货情况下,可以申请直接售后的操作需求。 【优化】后台商家手机号码支持设置多个,使用小写逗号分隔,方便多个商家管理员接收下单提醒。 【优化】后台售后单审核,调整售后商品为必选项。
This commit is contained in:
@@ -119,7 +119,7 @@ namespace CoreCms.Net.RedisMQ.Subscribe
|
||||
}
|
||||
//如果是单品模式
|
||||
else if (pointExchangeModel == 2)
|
||||
{
|
||||
{
|
||||
//未发货的商品库存调整,如果订单未发货或者部分发货,并且用户未收到商品的情况下
|
||||
if ((order.shipStatus == (int)GlobalEnumVars.OrderShipStatus.No ||
|
||||
order.shipStatus == (int)GlobalEnumVars.OrderShipStatus.PartialYes) &&
|
||||
|
||||
@@ -51,7 +51,7 @@ namespace CoreCms.Net.RedisMQ.Subscribe
|
||||
if (info != null)
|
||||
{
|
||||
await _distributionOrderServices.CancleOrderByOrderId(info.orderId);
|
||||
await _agentOrderServices.CancleOrderByOrderId(info.orderId);
|
||||
await _agentOrderServices.CancelOrderByOrderId(info.orderId);
|
||||
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "售后审核通过后处理", msg);
|
||||
}
|
||||
else
|
||||
|
||||
73
CoreCms.Net.RedisMQ/Subscribe/MessagePushSubscribe.cs
Normal file
73
CoreCms.Net.RedisMQ/Subscribe/MessagePushSubscribe.cs
Normal file
@@ -0,0 +1,73 @@
|
||||
/***********************************************************************
|
||||
* Project: CoreCms
|
||||
* ProjectName: 核心内容管理系统
|
||||
* Web: https://www.corecms.net
|
||||
* Author: 大灰灰
|
||||
* Email: jianweie@163.com
|
||||
* CreateTime: 2021/7/10 22:41:46
|
||||
* Description: 暂无
|
||||
***********************************************************************/
|
||||
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using CoreCms.Net.Configuration;
|
||||
using CoreCms.Net.IServices;
|
||||
using CoreCms.Net.Loging;
|
||||
using CoreCms.Net.Model.Entities;
|
||||
using InitQ.Abstractions;
|
||||
using InitQ.Attributes;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace CoreCms.Net.RedisMQ.Subscribe
|
||||
{
|
||||
/// <summary>
|
||||
/// 消息推送
|
||||
/// </summary>
|
||||
public class MessagePushSubscribe : IRedisSubscribe
|
||||
{
|
||||
|
||||
private readonly ICoreCmsUserServices _userServices;
|
||||
private readonly ICoreCmsOrderServices _orderServices;
|
||||
private readonly ICoreCmsBillRefundServices _billRefundServices;
|
||||
private readonly ICoreCmsUserGradeServices _userGradeServices;
|
||||
|
||||
|
||||
public MessagePushSubscribe(ICoreCmsUserServices userServices, ICoreCmsOrderServices orderServices, ICoreCmsBillRefundServices billRefundServices, ICoreCmsUserGradeServices userGradeServices)
|
||||
{
|
||||
_userServices = userServices;
|
||||
_orderServices = orderServices;
|
||||
_billRefundServices = billRefundServices;
|
||||
_userGradeServices = userGradeServices;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 推送微信模板消息
|
||||
/// </summary>
|
||||
/// <param name="msg"></param>
|
||||
/// <returns></returns>
|
||||
[Subscribe(RedisMessageQueueKey.MessageSendWxMessageTemplet)]
|
||||
private async Task MessageSendWxMessageTemplet(string msg)
|
||||
{
|
||||
try
|
||||
{
|
||||
var orderModel = JsonConvert.DeserializeObject<CoreCmsOrder>(msg);
|
||||
|
||||
|
||||
|
||||
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "订单完成-用户升级处理", msg);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.RedisMessageQueue, "订单完成-用户升级处理", msg, ex);
|
||||
throw;
|
||||
}
|
||||
await Task.CompletedTask;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -66,13 +66,13 @@ namespace CoreCms.Net.RedisMQ.Subscribe
|
||||
|
||||
var result = new WebApiCallBack();
|
||||
|
||||
if (order.receiptType == (int)GlobalEnumVars.OrderReceiptType.SelfDelivery)
|
||||
if (order.receiptType==(int)GlobalEnumVars.OrderReceiptType.SelfDelivery)
|
||||
{
|
||||
result = await _orderServices.Ship(order.orderId, "shangmenziti", "无", items, order.shipName, order.shipMobile, order.shipAddress, order.memo, order.storeId, order.shipAreaId);
|
||||
result = await _orderServices.Ship(order.orderId, "shangmenziti", "无", items, order.shipName, order.shipMobile, order.shipAddress, order.memo, order.storeId, order.shipAreaId, "OTHERS");
|
||||
}
|
||||
else if (order.receiptType == (int)GlobalEnumVars.OrderReceiptType.IntraCityService)
|
||||
{
|
||||
result = await _orderServices.Ship(order.orderId, "benditongcheng", "无", items, order.shipName, order.shipMobile, order.shipAddress, order.memo, order.storeId, order.shipAreaId);
|
||||
result = await _orderServices.Ship(order.orderId, "benditongcheng", "无", items, order.shipName, order.shipMobile, order.shipAddress, order.memo, order.storeId, order.shipAreaId, "OTHERS");
|
||||
}
|
||||
|
||||
NLogUtil.WriteAll(result.status ? NLog.LogLevel.Info : NLog.LogLevel.Error,
|
||||
|
||||
@@ -44,7 +44,8 @@ namespace CoreCms.Net.RedisMQ.Subscribe
|
||||
/// </summary>
|
||||
/// <param name="msg"></param>
|
||||
/// <returns></returns>
|
||||
[SubscribeDelay(RedisMessageQueueKey.OrderFinishCommand)]
|
||||
//[SubscribeDelay(RedisMessageQueueKey.OrderFinishCommand)]
|
||||
[Subscribe(RedisMessageQueueKey.OrderFinishCommand)]
|
||||
|
||||
private async Task OrderFinishCommand(string msg)
|
||||
{
|
||||
|
||||
@@ -66,7 +66,7 @@ namespace CoreCms.Net.RedisMQ.Subscribe
|
||||
var message = notify.ErrCode + ":" + notify.ErrCodeDes;
|
||||
await _billPaymentsServices.ToUpdate(notify.OutTradeNo,
|
||||
(int)GlobalEnumVars.BillPaymentsStatus.Other,
|
||||
GlobalEnumVars.PaymentsTypes.wechatpay.ToString(), money, notify.ReturnMsg, notify.TransactionId);
|
||||
GlobalEnumVars.PaymentsTypes.wechatpay.ToString(), money, msg);
|
||||
}
|
||||
}
|
||||
NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "微信支付成功后推送到接口进行数据处理", msg);
|
||||
|
||||
Reference in New Issue
Block a user