From aa784ab65cc24caf45a4c38af7e5fdeb526eb393 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 五月 2019 14:49:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 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 6c2829d..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;
@@ -31,6 +33,7 @@
@Override
public void startSyncGoods() {
+
// 鍒ゆ柇鏄惁鏈夋鍦ㄨ繘琛岀殑鏇存柊
String key1 = "dataoke-updating";
// if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(key1)))
@@ -107,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;
}
@@ -116,9 +121,11 @@
public List<DaTaoKeDetail> listByIds(List<Long> idList) {
return daTaoKeDetailMapper.listByIds(idList);
}
-
+
+
@Override
public List<DaTaoKeDetail> listByDtitle(String dtitle) {
+
return daTaoKeDetailMapper.listByDtitle(dtitle.trim());
}
@@ -133,4 +140,10 @@
return daTaoKeDetailMapper.countSearchByTitleWithCid(title, (cid == null || cid == 0 ? null : cid));
}
+
+ @Override
+ public List<DaTaoKeDetail> getGoodsNotInList(Long cid, List<Long> listId,int count) {
+ return daTaoKeDetailMapper.getGoodsNotInList(cid, listId,count);
+ }
+
}
--
Gitblit v1.8.0