From efa2645b74ebfadc43ebe448370adb22aecc1ad7 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:14:09 +0800
Subject: [PATCH] Merge branch 'div_10'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailServiceImpl.java
index 6bf6f04..ac246eb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailServiceImpl.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.service.impl.taobao.dataoke;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -17,6 +18,7 @@
import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
+import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.dataoke.DaTaoKeApiUtil;
import com.yeshi.fanli.util.taobao.DaTaoKeUtil;
@@ -108,8 +110,10 @@
List<DaTaoKeDetail> daTaoKeList = daTaoKeDetailMapper.listByGoodsIds(goodsIdList);
if (daTaoKeList == null || daTaoKeList.size() == 0)
return goods;
+
// 閲嶆柊璁剧疆鏍囬涓庡埜浠锋牸
goods = DaTaoKeUtil.filterTaoBaoGoods(goods, daTaoKeList.get(0));
+
return goods;
}
@@ -121,6 +125,7 @@
@Override
public List<DaTaoKeDetail> listByDtitle(String dtitle) {
+
return daTaoKeDetailMapper.listByDtitle(dtitle.trim());
}
@@ -136,9 +141,9 @@
}
-
@Override
public List<DaTaoKeDetail> getGoodsNotInList(Long cid, List<Long> listId,int count) {
return daTaoKeDetailMapper.getGoodsNotInList(cid, listId,count);
}
+
}
--
Gitblit v1.8.0