From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 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 4a847a3..c954acb 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
@@ -62,7 +62,17 @@
@Cacheable(value = "commonContentCache", key = "'tljBuy-listByDay'+#day")
@Override
public List<TLJBuyGoods> listByDay(String day) {
- return listByDay(day, 10);
+ List<TLJBuyGoods> list = listByDay(day, 10);
+ // if (list.size() <= 10)
+ // return list;
+ // else {
+ // List<TLJBuyGoods> newList = new ArrayList<>();
+ // for (int i = 0; i < 10; i++) {
+ // newList.add(list.get(i));
+ // }
+ // return newList;
+ // }
+ return list;
}
@Override
@@ -70,8 +80,19 @@
List<TLJBuyGoods> list = tljBuyGoodsDao.listByDayOrderByUpdateTime(day, 1, count);
List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
if (list != null) {
- for (TLJBuyGoods shg : list)
+ for (TLJBuyGoods shg : list) {
+ // 璁＄畻鎺ㄥ箍绾㈠寘
+ BigDecimal spreadMoney = TaoBaoUtil.getGoodsHongBaoMoney(shg.getGoods(),
+ TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);
+ BigDecimal finalPrice = TaoBaoUtil.getAfterUseCouplePrice(shg.getGoods());
+
+ // 鎺ㄥ箍绾㈠寘 涓嶈兘灏忎簬1,浠锋牸涓嶈兘澶т簬30
+ if (spreadMoney.compareTo(new BigDecimal(1.0)) < 0 || finalPrice.compareTo(new BigDecimal(30)) >= 0) {
+ continue;
+ }
+
goodsList.add(shg.getGoods());
+ }
}
// 杩囨护涓嬬嚎鍟嗗搧
goodsList = taoBaoGoodsBriefService.filterOffLineGoods(goodsList);
@@ -118,9 +139,7 @@
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),
- new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET,
- TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT));
+ new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 6), TaoBaoConstant.ownBuyApp);
} catch (TaoKeApiException e) {
if (e.getCode() == TaoKeApiException.CODE_TLJ_FORBIDDEN) {
// 璇ュ晢鍝佷笉鏀寔鍒涘缓娣樼ぜ閲戠孩鍖�
--
Gitblit v1.8.0