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 | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 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 3d9b3fd..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
@@ -4,6 +4,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import javax.annotation.Resource;
@@ -14,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;
@@ -129,6 +129,11 @@
@Override
public long countQueryByUid(Long uid) {
return userGoodsStorageMapper.countQueryByUid(uid);
+ }
+
+ @Override
+ public void updateShareState(Long shareId) {
+ userGoodsStorageMapper.updateShareState(shareId);
}
@Override
@@ -322,32 +327,44 @@
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