From 24a8d17e007545f7426c48352109aa1a9c6587ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 五月 2020 12:02:09 +0800
Subject: [PATCH] IOS上线隐藏我的界面的banner与超级会员升级信息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 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..73efe60 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
@@ -3,6 +3,7 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -22,11 +23,12 @@
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.log.LogHelper;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
-import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
@@ -46,9 +48,6 @@
private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
@Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
-
- @Resource
private EhCacheCacheManager ehCacheCacheManager;
@Resource
@@ -66,6 +65,8 @@
goods.setUpdateTime(new Date());
if (taoKeAppInfo != null)
goods.setAppKey(taoKeAppInfo.getAppKey());
+ if (goods.getWeight() == null)
+ goods.setWeight(1);
tljBuyGoodsDao.save(goods);
}
@@ -91,10 +92,28 @@
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);
}
Collections.shuffle(goodsList);
+ Comparator<TLJBuyGoods> cm = new Comparator<TLJBuyGoods>() {
+
+ @Override
+ public int compare(TLJBuyGoods o1, TLJBuyGoods o2) {
+ return o1.getWeight() != null && o2.getWeight() != null ? o2.getWeight() - o1.getWeight() : 0;
+ }
+ };
+ Collections.sort(goodsList, cm);
return goodsList;
}
@@ -111,7 +130,7 @@
// 杩囨护涓嬬嚎鍟嗗搧
goodsList = taoBaoGoodsBriefService.filterOffLineGoods(goodsList);
// 娣诲姞澶ф窐瀹俊鎭�
- goodsList = daTaoKeGoodsDetailService.filterTaoBaoGoods(goodsList);
+ goodsList = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goodsList);
Map<Long, TaoBaoGoodsBrief> goodsMap = new HashMap<>();
if (goodsList != null)
for (TaoBaoGoodsBrief g : goodsList)
@@ -157,20 +176,24 @@
}
@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) {
+ LogHelper.test("鍟嗗搧ID:"+auctionId);
+ LogHelper.test("娣樼ぜ閲戦獙璇佸嚭閿�:"+e1.getMsg());
+
+ 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 +267,12 @@
return tljBuyGoodsDao.selectByAuctionIdAndDay(auctionId, day);
}
+ @Override
+ public void removeGoods(Long auctionId) {
+ tljBuyGoodsDao.deleteByAuctionId(auctionId);
+ // 娓呴櫎鍒楄〃缂撳瓨
+ ehCacheCacheManager.getCache("commonContentCache")
+ .evict("tljBuy-listByDay" + TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd"));
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0