From e068c9acf06cff7673fadfca686128f6d6d66e20 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 12 八月 2019 11:12:57 +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/dynamic/DynamicInfoServiceImpl.java | 62 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
index 59636a0..0bab96c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
@@ -479,23 +479,23 @@
} catch (Exception e) {
}
-
+
TaoBaoGoodsBrief taoBaoGoodsBrief = TaoBaoUtil.convert(daTaoKe);
BigDecimal proportion = hongBaoManageService.getFanLiRate();
- TaoBaoGoodsBriefExtra goodsExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,
- proportion.toString(), null);
-
+ TaoBaoGoodsBriefExtra goodsExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(),
+ null);
+
if (!goodsExtra.isCoupon() || (goodsExtra.getState() != null && goodsExtra.getState() == 1)) {
- return addSuccess; // 宸蹭笅鏋� 銆佹棤鍒� 涓嶅姞鍏�
+ return addSuccess; // 宸蹭笅鏋� 銆佹棤鍒� 涓嶅姞鍏�
}
-
+
List<TaoBaoGoodsBrief> listGoods = new ArrayList<TaoBaoGoodsBrief>();
listGoods.add(taoBaoGoodsBrief);
-
+
goodsExtra.setTkRate(taoBaoGoodsBrief.getTkRate());
goodsExtra.setUpdatetime(new Date());
goodsExtra.setCouponInfo(null);
-
+
GoodsPicture goodsPicture = getGoodsPicture(daTaoKe);
goodsPicture.setGoods(goodsExtra);
// 鍟嗗搧鍒楄〃
@@ -527,7 +527,7 @@
}
}
goodsExtra.setImgList(imgList);
-
+
// 鍒嗕韩濂栭噾
BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(taoBaoGoodsBrief);
ClientTextStyleVO shareMoneyDesc = new ClientTextStyleVO();
@@ -556,7 +556,7 @@
// 淇濆瓨淇℃伅
dynamicInfoDao.insert(dynamicInfo);
-
+
addSuccess = true;
return addSuccess;
}
@@ -915,17 +915,18 @@
return list;
}
-
-
+
@Override
@Cacheable(value = "dynamicCache", key = "'queryV2-'+#platform+'-'+#version+'-'+#start+'-'+#count+'-'+#cid+'-'+#subId")
public List<DynamicInfo> queryV2(int platform, int version, int start, int count, Long cid, Long subId) {
List<DynamicInfo> listNew = new ArrayList<DynamicInfo>();
List<DynamicInfo> list = dynamicInfoDao.query(start, count, cid, subId);
+ // 闇�瑕佹洿鏂扮殑鍟嗗搧
+ List<TaoBaoGoodsBrief> taoBaoGoodsUpdateList = new ArrayList<>();
if (list != null && list.size() > 0) {
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
- for (DynamicInfo dynamicInfo: list) {
+ for (DynamicInfo dynamicInfo : list) {
DynamicInfo dynamicNew = new DynamicInfo();
try {
PropertyUtils.copyProperties(dynamicNew, dynamicInfo);
@@ -933,7 +934,7 @@
e.printStackTrace();
continue;
}
-
+
// 搴楅摵淇℃伅
TaoBaoShop shop = dynamicNew.getShop();
if (shop != null) {
@@ -952,17 +953,19 @@
}
dynamicNew.setShop(shopNew);
}
-
+
List<GoodsPicture> imgsNew = new ArrayList<GoodsPicture>();
List<GoodsPicture> imgs = dynamicNew.getImgs();
if (imgs != null && imgs.size() > 0) {
- for (GoodsPicture goodsPicture: imgs) {
+ for (GoodsPicture goodsPicture : imgs) {
TaoBaoGoodsBriefExtra goods = goodsPicture.getGoods();
if (goods == null) {
imgsNew.add(goodsPicture);
continue;
}
-
+
+ taoBaoGoodsUpdateList.add(goods);
+
GoodsPicture goodsNew = new GoodsPicture();
try {
PropertyUtils.copyProperties(goodsNew, goodsPicture);
@@ -970,19 +973,21 @@
e.printStackTrace();
continue;
}
-
- GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBaoGoodsBriefExtra(goods, fanLiRate, shareRate);
+
+ GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBaoGoodsBriefExtra(goods, fanLiRate,
+ shareRate);
goodsNew.setGoodsVO(detailVO);
goodsNew.setGoods(null);
-
+
JumpDetailV2 jumpDetail = goodsNew.getJumpDetail();
if (jumpDetail != null) {
- JumpDetailV2 jumpDetailV2 = jumpDetailV2Service.getByTypeCache(jumpDetail.getType(), platform, version);
+ JumpDetailV2 jumpDetailV2 = jumpDetailV2Service.getByTypeCache(jumpDetail.getType(),
+ platform, version);
if (jumpDetailV2 != null) {
goodsNew.setJumpDetail(jumpDetailV2);
}
}
-
+
imgsNew.add(goodsNew);
}
dynamicNew.setImgs(imgsNew);
@@ -990,7 +995,7 @@
listNew.add(dynamicNew);
}
}
-
+
// 鏇存柊鍟嗗搧淇℃伅
executor.execute(new Runnable() {
@Override
@@ -998,9 +1003,10 @@
updateGoodInfo(list);
}
});
+
+ taoBaoGoodsUpdateService.addUpdateQueueAsync(taoBaoGoodsUpdateList);
return listNew;
}
-
/**
* 鏇存柊鍟嗗搧淇℃伅
@@ -1013,7 +1019,7 @@
if (list == null || list.size() == 0) {
return;
}
-
+
try {
BigDecimal proportion = hongBaoManageService.getFanLiRate();
for (DynamicInfo dynamicInfo : list) {
@@ -1110,16 +1116,16 @@
dynamicInfo.setDesc(shareMoneyDesc);
}
}
-
+
// 闇�瑕佹洿鏂颁俊鎭紱
needUpdate = true;
}
-
+
// 鏃犳晥鏇存柊淇℃伅
if (!needUpdate) {
continue;
}
-
+
// 鏇存柊鍟嗗搧淇℃伅
dynamicInfo.setImgs(listPicture);
--
Gitblit v1.8.0