From ec6389a5f15c729a0a76577de04b61e602db0663 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 12 十二月 2018 10:31:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java
index e6d0e47..c66d4eb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java
@@ -4,7 +4,6 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import javax.annotation.Resource;
@@ -208,12 +207,10 @@
long nd = 1000 * 24 * 60 * 60;
List<CommonGoods> listUpadteCommonGoods = new ArrayList<CommonGoods>();
+ BigDecimal rate = manageService.getFanLiRate();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
- Map<String, String> map = manageService.convertMap();
- BigDecimal rate = manageService.getFanLiRate();
-
for (UserGoodsStorage userGoodsStorage : listStorage) {
CommonGoods commonGoods = userGoodsStorage.getCommonGoods();
@@ -231,20 +228,28 @@
if (goodsState != null && (goodsState != 1 || !goodsState.equals(1))) {
Date updateTime = commonGoods.getUpdateTime();
if (updateTime != null) {
- long diff = nowDate.getTime() - updateTime.getTime();
// 璁＄畻宸灏戝皬鏃�
+ long diff = nowDate.getTime() - updateTime.getTime();
+ long day = diff / nd;
long hour = diff % nd / nh;
- if (hour > 1 ) {
+ if (hour > 1 || day > 0 ) {
try {
if (commonGoods.getGoodsType() == CommonGoods.GOODS_TYPE_TB) {
goodsBrief = redisManager.getTaoBaoGoodsBrief(commonGoods.getGoodsId());
- goodsBrief.setState(0);
+
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();
}
}
@@ -253,25 +258,21 @@
if (goodsBrief == null) {
goodsBrief = TaoBaoUtil.convert(commonGoods);
- } else {
- CommonGoods upadeteCommonGoods = CommonGoodsFactory.create(goodsBrief);
- upadeteCommonGoods.setState(goodsState);
- listUpadteCommonGoods.add(upadeteCommonGoods);
- }
+ }
// 鍒ゆ柇鏄惁宸插垎浜�
Integer state = userGoodsStorage.getState();
int shared = UserGoodsStorage.STATE_SHARED;
if (state != null && (state == shared || state.equals(shared))) {
- if (goodsState != 1 || goodsState.equals(1)) {
+ if (goodsState != 1 || !goodsState.equals(1)) {
goodsBrief.setState(2); // 宸插垎浜姸鎬�
}
}
// 鏀瑰彉鍥剧墖灏哄
- String pictUrl = commonGoods.getPicture();
+ String pictUrl = goodsBrief.getPictUrl();
if (!StringUtil.isNullOrEmpty(pictUrl) && !pictUrl.contains("320x320")) {
- commonGoods.setPicture(TbImgUtil.getTBSize320Img(pictUrl));
+ goodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));
}
String json = gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, rate.toString(), null));
@@ -324,6 +325,8 @@
BigDecimal totalMoney = new BigDecimal(0.00);
List<TaoBaoGoodsBrief> listGoodsBrief = new ArrayList<TaoBaoGoodsBrief>();
+ String rateStr = hongBaoManageService.get("hongbao_goods_proportion");
+
for (UserGoodsStorage userGoodsStorage: listStorage) {
CommonGoods commonGoods = userGoodsStorage.getCommonGoods();
TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(commonGoods);
@@ -332,13 +335,13 @@
userGoodsStorage.setState(1);
userGoodsStorage.setUpdateTime(new Date());
- String rateStr = hongBaoManageService.get("hongbao_goods_proportion");
BigDecimal money = TaoBaoUtil.getGoodsHongBaoMoney(goodsBrief, new BigDecimal(rateStr));
totalMoney = MoneyBigDecimalUtil.add(totalMoney, money);
}
String revenue = listGoodsBrief.size() + "涓晢鍝侀浼板垎浜閲戯細楼"+totalMoney;
- FileUploadResult loadResult = userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.storage, listGoodsBrief);
+ FileUploadResult loadResult = userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.storage,
+ null, listGoodsBrief);
// 鏇存柊涓哄凡鍒嗕韩
userGoodsStorageMapper.updateBatchSelective(listStorage);
@@ -349,6 +352,5 @@
data.put("notifyDesc", configService.get("goods_share_notify"));
return data;
-
}
}
--
Gitblit v1.8.0