From 2305c8ef6da7d22d3139aac2d431e26a6d419753 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 09 一月 2019 17:37:12 +0800
Subject: [PATCH] Merge branch 'div1'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanDrawBackServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanDrawBackServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanDrawBackServiceImpl.java
index ecd5b44..630b4be 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanDrawBackServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanDrawBackServiceImpl.java
@@ -105,7 +105,7 @@
cv.setOrderNo(orderId);
typeList.add(cv);
- List<CommonOrderVO> commonOrderList = commonOrderMapper.listByOrderNoAndType(typeList);
+ List<CommonOrderVO> commonOrderList = commonOrderMapper.listOrderGoodsInfo(typeList);
List<HongBaoV2> mainHongBaoList = new ArrayList<>();
if (commonOrderList != null)
for (CommonOrderVO vo : commonOrderList) {
@@ -227,7 +227,7 @@
cv.setOrderNo(orderId);
typeList.add(cv);
- List<CommonOrderVO> commonOrderList = commonOrderMapper.listByOrderNoAndType(typeList);
+ List<CommonOrderVO> commonOrderList = commonOrderMapper.listOrderGoodsInfo(typeList);
List<HongBaoV2> mainHongBaoList = new ArrayList<>();
if (commonOrderList != null)
for (CommonOrderVO vo : commonOrderList) {
@@ -355,7 +355,7 @@
cv.setOrderNo(orderId);
typeList.add(cv);
- List<CommonOrderVO> commonOrderList = commonOrderMapper.listByOrderNoAndType(typeList);
+ List<CommonOrderVO> commonOrderList = commonOrderMapper.listOrderGoodsInfo(typeList);
List<HongBaoV2> mainHongBaoList = new ArrayList<>();
if (commonOrderList != null)
for (CommonOrderVO vo : commonOrderList) {
--
Gitblit v1.8.0