From 9f09e749e7198051b9af6c2421336a80b58b79a4 Mon Sep 17 00:00:00 2001
From: 喻健 <喻健@Admin>
Date: 星期三, 19 十二月 2018 16:33:12 +0800
Subject: [PATCH] 当日提现成功超过100元 返回高危标识
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java | 76 +++++++++++++++++++++++---------------
1 files changed, 46 insertions(+), 30 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 afda25f..2d3f951 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
@@ -15,7 +15,6 @@
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Service;
import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.entity.FileUploadResult;
import org.yeshi.utils.taobao.TbImgUtil;
import com.google.gson.Gson;
@@ -131,6 +130,11 @@
public long countQueryByUid(Long uid) {
return userGoodsStorageMapper.countQueryByUid(uid);
}
+
+ @Override
+ public void updateShareState(Long shareId) {
+ userGoodsStorageMapper.updateShareState(shareId);
+ }
@Override
public void save(Long uid, Set<Long> auctionIds) throws UserGoodsStorageException {
@@ -208,13 +212,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();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
-
for (UserGoodsStorage userGoodsStorage : listStorage) {
CommonGoods commonGoods = userGoodsStorage.getCommonGoods();
@@ -232,20 +233,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();
}
}
@@ -254,27 +263,23 @@
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, proportion, fcRate, null));
+ String json = gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, rate.toString(), null));
dataObject.put("storageId", userGoodsStorage.getId());
dataObject.put("goods", json);
@@ -322,34 +327,45 @@
throw new UserGoodsStorageException(1, "閫夊搧搴撳晢鍝佷笉瀛樺湪");
}
+
+ List<UserGoodsStorage> listResult = new ArrayList<UserGoodsStorage>();
+ // 杩樺師椤哄簭 鐢ㄤ簬鍒跺浘
+ for (Long sid: listStorageID) {
+ for (UserGoodsStorage torage: listStorage) {
+ Long id = torage.getId();
+ if (sid == id || sid.equals(id)) {
+ listResult.add(torage);
+ break;
+ }
+ }
+ }
+
+
BigDecimal totalMoney = new BigDecimal(0.00);
List<TaoBaoGoodsBrief> listGoodsBrief = new ArrayList<TaoBaoGoodsBrief>();
- for (UserGoodsStorage userGoodsStorage: listStorage) {
+ String rateStr = hongBaoManageService.get("hongbao_goods_proportion");
+
+ for (UserGoodsStorage userGoodsStorage: listResult) {
CommonGoods commonGoods = userGoodsStorage.getCommonGoods();
TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(commonGoods);
listGoodsBrief.add(goodsBrief);
- // 宸插垎浜�
- 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);
-
- // 鏇存柊涓哄凡鍒嗕韩
- userGoodsStorageMapper.updateBatchSelective(listStorage);
+
+ Map<String,Object> map = userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.storage,
+ null, listGoodsBrief);
JSONObject data = new JSONObject();
- data.put("shareImg", loadResult);
data.put("revenue", revenue);
- data.put("notifyDesc", configService.get("goods_share_notify"));
+ data.put("shareId", map.get("shareId"));
+ data.put("shareImg", map.get("loadResult"));
+ data.put("notifyDesc", configService.get("goods_share_multiple_notify"));
return data;
-
}
}
--
Gitblit v1.8.0