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/ShareHotGoodsServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/ShareHotGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/ShareHotGoodsServiceImpl.java
index 5a3233c..4e0bdc0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/ShareHotGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/ShareHotGoodsServiceImpl.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.impl.taobao;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -13,18 +14,21 @@
import org.springframework.stereotype.Service;
import com.yeshi.fanli.dao.taobao.ShareHotGoodsDao;
-import com.yeshi.fanli.dto.taobao.TaoLiJinDTO;
import com.yeshi.fanli.entity.taobao.ShareHotGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
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.ShareHotGoodsService;
+import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;
+import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
+import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TaoBaoConstant;
+import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -42,6 +46,12 @@
@Resource
private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+ @Resource
+ private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
+
+ @Resource
+ private ConfigTaoLiJinService configTaoLiJinService;
+
@Override
public void addShareHotGoods(ShareHotGoods goods) {
if (goods == null || StringUtil.isNullOrEmpty(goods.getDay()) || goods.getGoods() == null)
@@ -66,6 +76,10 @@
for (ShareHotGoods shg : list)
goodsList.add(shg.getGoods());
}
+
+ // 杩囨护鍩烘湰鍟嗗搧淇℃伅
+ goodsList = taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(goodsList);
+
// 杩囨护涓嬬嚎鍟嗗搧
goodsList = taoBaoGoodsBriefService.filterOffLineGoods(goodsList);
// 娣诲姞澶ф窐瀹俊鎭�
@@ -91,7 +105,15 @@
@Override
public List<TaoBaoGoodsBrief> listPreGoods(int page) {
- List<DaTaoKeDetailV2> list = daTaoKeGoodsDetailV2Service.listPreShareHotGoods(page);
+ String warningValue = configTaoLiJinService.getValueByKey("warning_value",
+ new Date(TimeUtil.convertToTimeTemp(
+ TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd"),
+ "yyyy-MM-dd")));
+
+ BigDecimal minComminsion = new BigDecimal(1)
+ .divide(new BigDecimal(warningValue).multiply(new BigDecimal("0.01")), 2, RoundingMode.UP);
+
+ List<DaTaoKeDetailV2> list = daTaoKeGoodsDetailV2Service.listPreShareHotGoods(page, minComminsion);
List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
if (list != null) {
for (DaTaoKeDetailV2 v2 : list)
@@ -106,21 +128,19 @@
}
@Override
- public boolean verifyCanCreateTLJ(Long auctionId,TaoKeAppInfo info) {
- TaoLiJinDTO taoLiJinDTO = null;
+ public boolean verifyCanCreateTLJ(Long auctionId, TaoKeAppInfo info) {
try {
- taoLiJinDTO = TaoKeApiUtil.createTaoLiJin(auctionId, "娣樼ぜ閲戦獙璇�", new BigDecimal("1.00"), 1, new Date(),
+ 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),
- info);
- } catch (TaoKeApiException e) {
- if (e.getCode() == TaoKeApiException.CODE_TLJ_FORBIDDEN) {
- // 璇ュ晢鍝佷笉鏀寔鍒涘缓娣樼ぜ閲戠孩鍖�
+ new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 6), info);
+ } catch (TaoLiJinCreateException e1) {
+ if (e1.getCode() == TaoLiJinCreateException.CODE_TLJ_FORBIDDEN) {// 鍟嗗搧涓嶅厑璁稿垱寤烘窐绀奸噾
deleteByGoodsId(auctionId);
return false;
- } else if (e.getCode() == TaoKeApiException.CODE_TLJ_NO_MONEY) {
- // 瀹樻柟鐜╂硶閽卞寘浣欓涓嶈冻 TODO
}
+
+ } catch (TaoKeApiException e) {
+
}
return true;
}
@@ -140,6 +160,7 @@
shareHotGoods.getGoods().setCouponStartFee(goods.getCouponStartFee());
shareHotGoods.getGoods().setCouponTotalCount(goods.getCouponTotalCount());
shareHotGoods.getGoods().setBiz30day(goods.getBiz30day());
+ shareHotGoods.getGoods().setTkRate(goods.getTkRate());
shareHotGoodsDao.save(shareHotGoods);
}
}
--
Gitblit v1.8.0