From aad0554cc7f18a6ec05e2e5e646b5e501d41617d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:13:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/ShareHotGoodsServiceImpl.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 2 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 bb61755..d600f2b 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,5 +1,7 @@
package com.yeshi.fanli.service.impl.taobao;
+import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -8,31 +10,84 @@
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.dataoke.DaTaoKeDetailV2;
+import com.yeshi.fanli.exception.taobao.TaoKeApiException;
import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService;
+import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TaoBaoConstant;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
+import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@Service
public class ShareHotGoodsServiceImpl implements ShareHotGoodsService {
@Resource
private ShareHotGoodsDao shareHotGoodsDao;
+ @Resource
+ private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
+
@Override
public void addShareHotGoods(ShareHotGoods goods) {
if (goods == null || StringUtil.isNullOrEmpty(goods.getDay()) || goods.getGoods() == null)
return;
goods.setId(StringUtil.Md5(goods.getDay() + "#" + goods.getGoods().getAuctionId()));
- goods.setUpdateTime(new Date());
+ if (goods.getUpdateTime() == null)
+ goods.setUpdateTime(new Date());
shareHotGoodsDao.save(goods);
}
@Override
public List<ShareHotGoods> listByDay(String day) {
- return shareHotGoodsDao.listByDayOrderByUpdateTime(day, 1, 10);
+ return listByDay(day, 10);
+ }
+
+ @Override
+ public List<ShareHotGoods> listByDay(String day, int count) {
+ return shareHotGoodsDao.listByDayOrderByUpdateTime(day, 1, count);
}
@Override
public void deleteById(String id) {
shareHotGoodsDao.delete(id);
}
+
+ @Override
+ public List<TaoBaoGoodsBrief> listPreGoods() {
+ List<DaTaoKeDetailV2> list = daTaoKeGoodsDetailV2Service.listPreShareHotGoods();
+ List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
+ if (list != null) {
+ for (DaTaoKeDetailV2 v2 : list)
+ goodsList.add(TaoBaoUtil.convert(v2));
+ }
+ return goodsList;
+ }
+
+ @Override
+ public void deleteByGoodsId(Long goodsId) {
+ shareHotGoodsDao.deleteByGoodsId(goodsId);
+ }
+
+ @Override
+ public boolean verifyCanCreateTLJ(Long auctionId) {
+ 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),
+ TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT);
+ } catch (TaoKeApiException e) {
+ if (e.getCode() == TaoKeApiException.CODE_TLJ_FORBIDDEN) {
+ // 璇ュ晢鍝佷笉鏀寔鍒涘缓娣樼ぜ閲戠孩鍖�
+ deleteByGoodsId(auctionId);
+ return false;
+ } else if (e.getCode() == TaoKeApiException.CODE_TLJ_NO_MONEY) {
+ // 瀹樻柟鐜╂硶閽卞寘浣欓涓嶈冻 TODO
+ }
+ }
+ return true;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0