From 7d0e9ea762cf1496c31ebc5efc9b8d22a87a8cef Mon Sep 17 00:00:00 2001
From: chenchen <934298133@qq.com>
Date: Sat, 17 Jun 2023 23:47:38 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BE=9D=E8=B5=96=E5=90=AF=E5=8A=A8?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yudao-dependencies/pom.xml | 5 +++++
yudao-framework/yudao-spring-boot-starter-biz-trade/pom.xml | 4 ----
.../trade/service/aftersale/TradeAfterSaleServiceImpl.java | 6 +++---
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index b34b01f63..92b914c97 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -96,6 +96,11 @@
yudao-spring-boot-starter-biz-operatelog
${revision}
+
+ cn.iocoder.boot
+ yudao-spring-boot-starter-biz-trade
+ ${revision}
+
cn.iocoder.boot
yudao-spring-boot-starter-biz-dict
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-trade/pom.xml b/yudao-framework/yudao-spring-boot-starter-biz-trade/pom.xml
index ab9c820bf..0008793e5 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-trade/pom.xml
+++ b/yudao-framework/yudao-spring-boot-starter-biz-trade/pom.xml
@@ -46,9 +46,5 @@
com.google.guava
guava
-
- cn.iocoder.boot
- yudao-spring-boot-starter-security
-
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceImpl.java
index 42829a2a9..94cd15876 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceImpl.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceImpl.java
@@ -5,7 +5,7 @@ import cn.hutool.core.util.RandomUtil;
import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
-import cn.iocoder.yudao.framework.trade.core.dto.TradeAfterSaleLogDTO;
+import cn.iocoder.yudao.framework.trade.core.dto.TradeAfterSaleLogCreateReqDTO;
import cn.iocoder.yudao.framework.trade.core.service.AfterSaleLogService;
import cn.iocoder.yudao.module.pay.api.refund.PayRefundApi;
import cn.iocoder.yudao.module.pay.api.refund.dto.PayRefundCreateReqDTO;
@@ -388,7 +388,7 @@ public class TradeAfterSaleServiceImpl implements TradeAfterSaleService, AfterSa
@Deprecated
private void createAfterSaleLog(Long userId, Integer userType, TradeAfterSaleDO afterSale,
Integer beforeStatus, Integer afterStatus) {
- TradeAfterSaleLogDTO logDTO = new TradeAfterSaleLogDTO()
+ TradeAfterSaleLogCreateReqDTO logDTO = new TradeAfterSaleLogCreateReqDTO()
.setUserId(userId)
.setUserType(userType)
.setAfterSaleId(afterSale.getId())
@@ -406,7 +406,7 @@ public class TradeAfterSaleServiceImpl implements TradeAfterSaleService, AfterSa
*/
@Override
@Async
- public void insert(TradeAfterSaleLogDTO logDTO) {
+ public void insert(TradeAfterSaleLogCreateReqDTO logDTO) {
try {
TradeAfterSaleLogDO afterSaleLog = new TradeAfterSaleLogDO()
.setUserId(logDTO.getUserId())