gitee/yudao-cloud
1
0
Fork 0
mirror of https://gitee.com/zhijiantianya/yudao-cloud.git synced 2026-03-22 05:07:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud

Browse Source 
# Conflicts:
#	yudao-gateway/src/main/resources/application.yaml
#	yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java
#	yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApiImpl.java
#	yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java
#	yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
#	yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
This commit is contained in:
YunaiV
2026-01-18 16:58:19 +08:00
parent 51da2a2f36 9defcf736c
commit d5ed2f4728
11 changed files with 58 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
yudao-module-mall/yudao-module-trade-server/src/main/java/cn/iocoder/yudao/module/trade/framework/order/core/aop/TradeOrderLogAspect.java
View File

@@ -65,11 +65,17 @@ public class TradeOrderLogAspect {
public void doAfterReturning(JoinPoint joinPoint, TradeOrderLog orderLog) {
try {
// 1.1 操作用户
Integer userType = getUserType();
Long userId = getUserId();
Integer userType = USER_TYPE.get();
if (ObjectUtil.isNull(userType)) {
userType = getUserType();
}
Long userId = USER_ID.get();
if (ObjectUtil.isNull(userId)) {
userId = getUserId();
}
// 1.2 订单信息
Long orderId = ORDER_ID.get();
if (orderId == null) { // 如果未设置，只有注解，说明不需要记录日志
if (ObjectUtil.isNull(orderId)) { // 如果未设置，只有注解，说明不需要记录日志
return;
}
Integer beforeStatus = BEFORE_STATUS.get();