From 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 29 四月 2019 08:59:47 +0800
Subject: [PATCH] Merge branch 'div_develop' into master_develop
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoGoodsUpdateServiceImpl.java | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoGoodsUpdateServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoGoodsUpdateServiceImpl.java
index df349e6..a8bea9e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoGoodsUpdateServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoGoodsUpdateServiceImpl.java
@@ -12,14 +12,13 @@
import com.google.gson.Gson;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoGoodsBriefMapper;
+import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.exception.goods.CommonGoodsException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;
-import com.yeshi.fanli.goods.CommonGoods;
import com.yeshi.fanli.service.inter.activity.ActivityService;
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
-import com.yeshi.fanli.service.inter.goods.RecommendSectionGoodsService;
import com.yeshi.fanli.service.inter.lable.QualityFactoryService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.util.BeanUtil;
@@ -29,8 +28,6 @@
@Service
public class TaoBaoGoodsUpdateServiceImpl implements TaoBaoGoodsUpdateService {
- @Resource
- private RecommendSectionGoodsService recommendSectionGoodsService;
@Resource
private ActivityService activityService;
@@ -61,7 +58,7 @@
}
} catch (TaobaoGoodsDownException e) {
- downTaoBaoGoods(goods.getAuctionId());
+ offlineTaoBaoGoods(goods.getAuctionId());
} catch (Exception e) {
}
@@ -71,9 +68,6 @@
@Transactional
@Override
public void deleteTaoBaoGoods(Long auctionId) {
- // 鍒犻櫎棣栭〉鎺ㄨ崘鏁版嵁
- recommendSectionGoodsService.deleteRecommendSectionGoodsByTbAuctionId(auctionId);
-
// 鍒犻櫎绮鹃�夊簱鐩稿叧鐨勬暟鎹�
qualityFactoryService.deleteByTbAuctionId(auctionId);
@@ -83,9 +77,7 @@
@Transactional
@Override
- public void downTaoBaoGoods(Long auctionId) {
- // 鍒犻櫎棣栭〉鎺ㄨ崘鏁版嵁
- recommendSectionGoodsService.deleteRecommendSectionGoodsByTbAuctionId(auctionId);
+ public void offlineTaoBaoGoods(Long auctionId) {
// 鏇存柊鍔ㄦ�佹暟鎹�
activityService.downTaoBaoGoods(auctionId);
@@ -94,6 +86,9 @@
// 鍒犻櫎鍟嗗搧鏈韩鏁版嵁
taoBaoGoodsBriefMapper.deleteByAuctionId(auctionId);
+
+ // 鏇存柊绠�鐗堝晢鍝佺姸鎬佷负涓嬫灦
+ commonGoodsService.offlineCommonGoods(auctionId, CommonGoods.GOODS_TYPE_TB);
}
@Transactional
@@ -121,6 +116,9 @@
taoBaoGoodsBriefMapper.updateByPrimaryKeySelective(updateGoods);
}
+
+ // 鏇存柊鍔ㄦ�佸晢鍝�
+ activityService.updateRecommendActivityGoods(goods);
}
@Override
@@ -146,6 +144,7 @@
// 鏇存柊鏍囬锛屽晢鍝佸浘鐗囷紝閿�閲忥紝浠锋牸锛屽埜淇℃伅锛岃繑鍒╀俊鎭紝搴楅摵淇℃伅锛屽垎绫讳俊鎭�
updateGoods.setTitle(goods.getTitle());
updateGoods.setPictUrl(goods.getPictUrl());
+ updateGoods.setPictUrlWhite(goods.getPictUrlWhite());
updateGoods.setImgList(goods.getImgList());
updateGoods.setBiz30day(goods.getBiz30day());
updateGoods.setZkPrice(goods.getZkPrice());
@@ -183,20 +182,30 @@
updateGoods.setRootCategoryName(goods.getRootCategoryName());
updateGoods.setLeafCatId(goods.getLeafCatId());
updateGoods.setLeafName(goods.getLeafName());
+ updateGoods.setMaterialLibType(goods.getMaterialLibType());
return updateGoods;
}
@Override
public void updateTaoBaoGoods(List<TaoBaoGoodsBrief> goodsList) throws TaobaoGoodsUpdateException {
- if (goodsList == null)
- return;
+ if (goodsList == null || goodsList.size() == 0)
+ throw new TaobaoGoodsUpdateException(1, "鍟嗗搧鍒楄〃涓虹┖");
+
List<TaoBaoGoodsBrief> updateList = new ArrayList<>();
+
for (TaoBaoGoodsBrief goods : goodsList) {
- if (goods.getId() == null || goods.getId() == 0L)
+
+ if (goods.getId() == null || goods.getId() == 0L) {
throw new TaobaoGoodsUpdateException(1, "鍟嗗搧涓婚敭ID涓虹┖");
- updateList.add(goods);
+ }
+
+ TaoBaoGoodsBrief updateGoods = getUpdateTaoBaoGoodsBrief(goods);
+ updateGoods.setCreatetime(goods.getCreatetime());
+
+ updateList.add(updateGoods);
}
+
taoBaoGoodsBriefMapper.updateBatchSelective(updateList);
}
--
Gitblit v1.8.0