From 5a9e4c13d08d3b1cb7da8f50f1097b33bb113b23 Mon Sep 17 00:00:00 2001
From: 喻健 <喻健@Admin>
Date: 星期一, 10 十二月 2018 17:52:03 +0800
Subject: [PATCH] 选品库商品优化
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsGroupServiceImpl.java | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsGroupServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsGroupServiceImpl.java
index 4bb673c..6771f01 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsGroupServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsGroupServiceImpl.java
@@ -194,7 +194,6 @@
Map<String, String> map = hongBaoManageService.convertMap();
String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
for (UserShareGoodsGroup userShareGoodsGroup : list) {
CommonGoods commonGoods = userShareGoodsGroup.getCommonGoods();
@@ -211,20 +210,29 @@
if (goodsState != null && (goodsState != 1 || !goodsState.equals(1))) {
Date updateTime = commonGoods.getUpdateTime();
if (updateTime != null) {
- long diff = nowDate.getTime() - updateTime.getTime();
+
// 璁＄畻宸灏戝皬鏃�
- long hour = diff % nd / nh;
- if (hour > 1) {
- try {
- if (commonGoods.getGoodsType() == CommonGoods.GOODS_TYPE_TB) {
- goodsBrief = redisManager.getTaoBaoGoodsBrief(commonGoods.getGoodsId());
- goodsBrief.setState(0);
- goodsState = 0;
- }
+ long diff = nowDate.getTime() - updateTime.getTime();
+ long day = diff / nd;
+ long hour = diff % nd / nh;
+ if (hour > 1 || day > 0 ) {
+ try {
+ if (commonGoods.getGoodsType() == CommonGoods.GOODS_TYPE_TB) {
+ goodsBrief = redisManager.getTaoBaoGoodsBrief(commonGoods.getGoodsId());
+
+ goodsState = 0;
+ goodsBrief.setState(goodsState);
+
+ CommonGoods upadeteCommonGoods = CommonGoodsFactory.create(goodsBrief);
+ upadeteCommonGoods.setState(goodsState);
+ upadeteCommonGoods.setId(commonGoods.getId());
+ listUpadteCommonGoods.add(upadeteCommonGoods);
+ }
} catch (TaobaoGoodsDownException e) {
// 宸蹭笅鏋�
goodsState = 1;
- commonGoods.setState(1);
+ commonGoods.setState(goodsState);
+ listUpadteCommonGoods.add(commonGoods);
e.printStackTrace();
}
}
@@ -233,11 +241,7 @@
if (goodsBrief == null) {
goodsBrief = TaoBaoUtil.convert(commonGoods);
- } else {
- CommonGoods upadeteCommonGoods = CommonGoodsFactory.create(goodsBrief);
- upadeteCommonGoods.setState(goodsState);
- listUpadteCommonGoods.add(upadeteCommonGoods);
- }
+ }
// 鏀瑰彉鍥剧墖灏哄
String pictUrl = commonGoods.getPicture();
@@ -245,10 +249,8 @@
commonGoods.setPicture(TbImgUtil.getTBSize320Img(pictUrl));
}
- String json = gson
- .toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion, fcRate));
+ String json = gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion, null));
-
dataObject.put("groupId", userShareGoodsGroup.getId());
dataObject.put("goods", json);
array.add(dataObject);
--
Gitblit v1.8.0