From 2764ae2d7f4d9cb9810a2188c92cb2eb439c3f22 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 09 五月 2019 13:07:02 +0800
Subject: [PATCH] 冲突
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailServiceImpl.java | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 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 f285738..c2effd6 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
@@ -21,6 +21,7 @@
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;
@Service
public class DaTaoKeGoodsDetailServiceImpl implements DaTaoKeGoodsDetailService {
@@ -95,7 +96,7 @@
map.put(goods.getGoodsId(), goods);
for (TaoBaoGoodsBrief goods : goodsList) {
DaTaoKeDetail detail = map.get(goods.getAuctionId());
- goods = filterTaoBaoGoods(goods, detail);
+ goods = DaTaoKeUtil.filterTaoBaoGoods(goods, detail);
}
return goodsList;
}
@@ -110,22 +111,8 @@
return goods;
// 閲嶆柊璁剧疆鏍囬涓庡埜浠锋牸
- goods = filterTaoBaoGoods(goods, daTaoKeList.get(0));
+ goods = DaTaoKeUtil.filterTaoBaoGoods(goods, daTaoKeList.get(0));
- return goods;
- }
-
- private TaoBaoGoodsBrief filterTaoBaoGoods(TaoBaoGoodsBrief goods, DaTaoKeDetail detail) {
- if (detail != null) {
- // 閲嶆柊璁剧疆鏍囬涓庡埜浠锋牸
- goods.setTitle(detail.getdTitle());
- goods.setCouponAmount(detail.getQuanPrice());
- if (new BigDecimal(detail.getQuanCondition()).compareTo(new BigDecimal(0)) > 0)
- goods.setCouponInfo(String.format("婊�%s鍏冨噺%s鍏�", detail.getQuanCondition(),
- MoneyBigDecimalUtil.getWithNoZera(detail.getQuanPrice()).toString()));
- else
- goods.setCouponInfo(String.format("%s鍏冩棤鏉′欢鍒�", detail.getQuanPrice()));
- }
return goods;
}
@@ -139,4 +126,11 @@
public List<DaTaoKeDetail> getGoodsNotInList(Long cid, List<Long> listId,int count) {
return daTaoKeDetailMapper.getGoodsNotInList(cid, listId,count);
}
+
+ @Override
+ public List<DaTaoKeDetail> listByDtitle(String dtitle) {
+
+ return daTaoKeDetailMapper.listByDtitle(dtitle.trim());
+ }
+
}
--
Gitblit v1.8.0