From bd331a582851cffcce54316e677e23760de4f384 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:36:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanOrderServiceImpl.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanOrderServiceImpl.java
index 1dfbb55..485783b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanOrderServiceImpl.java
@@ -81,4 +81,9 @@
return taoBaoWeiQuanOrderMapper.selectListByOrderIdAndState(orderId, "缁存潈鎴愬姛");
}
+ @Override
+ public TaoBaoWeiQuanOrder listByorderItemId(String tradeId) {
+ return taoBaoWeiQuanOrderMapper.selectByOrderItemId(tradeId);
+ }
+
}
--
Gitblit v1.8.0