From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java
index fbcecc4..8d011b6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java
@@ -22,6 +22,7 @@
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
+import com.yeshi.fanli.exception.tlj.TaoLiJinCreateException;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
@@ -91,6 +92,16 @@
List<TLJBuyGoods> goodsList = new ArrayList<>();
for (TaoBaoUnionConfig appInfo : configList) {
List<TLJBuyGoods> list = listByDay(appInfo.getAppKey(), day, 10);
+ if (list != null)
+ for (int i = 0; i < list.size(); i++) {
+ // 杩囨护娣樼ぜ閲戝ぇ浜�10鍧楅挶鐨�
+ BigDecimal hongBao = TaoBaoUtil.getGoodsHongBaoMoney(list.get(i).getGoods(),
+ TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);
+ if (hongBao.compareTo(new BigDecimal(10)) > 0) {
+ list.remove(i--);
+ }
+ }
+
if (list != null && list.size() > 0)
goodsList.addAll(list);
}
@@ -157,20 +168,21 @@
}
@Override
- public boolean verifyCanCreateTLJ(Long auctionId,TaoKeAppInfo app) {
+ public boolean verifyCanCreateTLJ(Long auctionId, TaoKeAppInfo app) {
TaoLiJinDTO taoLiJinDTO = null;
try {
taoLiJinDTO = TaoKeApiUtil.createTaoLiJin(auctionId, "娣樼ぜ閲戦獙璇�", new BigDecimal("1.00"), 1, new Date(),
new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 6), new Date(),
new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 6), app);
- } catch (TaoKeApiException e) {
- if (e.getCode() == TaoKeApiException.CODE_TLJ_FORBIDDEN) {
+ } catch (TaoLiJinCreateException e1) {
+ if (e1.getCode() == TaoLiJinCreateException.CODE_TLJ_FORBIDDEN) {
// 璇ュ晢鍝佷笉鏀寔鍒涘缓娣樼ぜ閲戠孩鍖�
deleteByGoodsId(auctionId);
return false;
- } else if (e.getCode() == TaoKeApiException.CODE_TLJ_NO_MONEY) {
+ } else if (e1.getCode() == TaoLiJinCreateException.CODE_TLJ_NO_MONEY) {
// 瀹樻柟鐜╂硶閽卞寘浣欓涓嶈冻 TODO
}
+ } catch (TaoKeApiException e) {
}
return true;
}
@@ -244,4 +256,9 @@
return tljBuyGoodsDao.selectByAuctionIdAndDay(auctionId, day);
}
+ @Override
+ public void removeGoods(Long auctionId) {
+ tljBuyGoodsDao.deleteByAuctionId(auctionId);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0