From f0b45fd50863cc322858730c55b53c06d11f6dd2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 23 五月 2019 15:59:58 +0800
Subject: [PATCH] 优化 只有下架才会出现分享奖金0
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java | 71 ++++++++++++++++++++++++++---------
1 files changed, 53 insertions(+), 18 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 fd0b0b6..f24931c 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
@@ -111,7 +111,7 @@
String materialId = inviteMaterial.getId();
String content = inviteMaterial.getText();
- ActivityUser user=activityUserService.selectByPrimaryKey(1L);
+ ActivityUser user=activityUserService.selectByPrimaryKey(2L);
if (!StringUtil.isNullOrEmpty(content)) {
DynamicInfo dynamicTxt= new DynamicInfo();
@@ -731,8 +731,9 @@
}
}
- // 鏇存柊
- BigDecimal shareMoney = new BigDecimal(0);
+ // 鍟嗗搧鍒楄〃
+ List<TaoBaoGoodsBrief> listGoods = new ArrayList<TaoBaoGoodsBrief>();
+
for (GoodsPicture goodsPicture: imgs) {
TaoBaoGoodsBriefExtra oldExtra = goodsPicture.getGoods();
if (oldExtra == null) {
@@ -746,38 +747,72 @@
try {
TaoBaoGoodsBrief goodsBrief = redisManager.getTaoBaoGoodsBrief(oldExtra.getAuctionId());
+ listGoods.add(goodsBrief);
+
+ // 鏇存柊鐑攢鍗曞搧鐨勫垎浜閲� 锛屽叾浣欎笉鍋氭洿鏂�
+ if (classId == 1) {
+ BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(goodsBrief);
+ ClientTextStyleVO shareMoneyDesc = new ClientTextStyleVO();
+ shareMoneyDesc.setColor("#FFFFFF");
+ shareMoneyDesc.setBottomColor("#E8AE48");
+ shareMoneyDesc.setContent("棰勪及鍒嗕韩濂栭噾锛毬�" + shareMoney);
+ dynamicInfo.setDesc(shareMoneyDesc);
+ }
+
TaoBaoGoodsBriefExtra newExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion.toString(), null);
if (!newExtra.isCoupon()) {
newExtra.setState(1);
}
newExtra.setUpdatetime(new Date());
- newExtra.setTkRate(goodsBrief.getTkRate());
goodsPicture.setGoods(newExtra);
-
-
- // 鏇存柊鐑攢鍗曞搧鐨勫垎浜閲� 锛屽叾浣欎笉鍋氭洿鏂�
- if (classId == 1) {
- BigDecimal money = taoBaoGoodsBriefService.getShareGoodsUserHongBao(goodsBrief);
- shareMoney = MoneyBigDecimalUtil.add(shareMoney, money);
- }
} catch (TaobaoGoodsDownException e) {
oldExtra.setState(1);
oldExtra.setCoupon(false);
oldExtra.setUpdatetime(new Date());
goodsPicture.setGoods(oldExtra);
+
+ // 鏇存柊鐑攢鍗曞搧鐨勫垎浜閲� 锛屽叾浣欎笉鍋氭洿鏂�
+ if (classId == 1) {
+ ClientTextStyleVO shareMoneyDesc = new ClientTextStyleVO();
+ shareMoneyDesc.setColor("#FFFFFF");
+ shareMoneyDesc.setBottomColor("#E8AE48");
+ shareMoneyDesc.setContent("棰勪及鍒嗕韩濂栭噾锛毬�" + new BigDecimal(0));
+ dynamicInfo.setDesc(shareMoneyDesc);
+ }
e.printStackTrace();
}
}
- // 鏇存柊鐑攢鍗曞搧鐨勫垎浜閲� 锛屽叾浣欎笉鍋氭洿鏂�
- if (classId == 1) {
- ClientTextStyleVO shareMoneyDesc = new ClientTextStyleVO();
- shareMoneyDesc.setColor("#FFFFFF");
- shareMoneyDesc.setBottomColor("#E8AE48");
- shareMoneyDesc.setContent("棰勪及鍒嗕韩濂栭噾锛毬�" + shareMoney);
- dynamicInfo.setDesc(shareMoneyDesc);
+
+
+ // 鏇存柊鍟嗗搧
+ List<TaoBaoGoodsBrief> listGoodsBrief = dynamicInfo.getListGoodsBrief();
+ if (listGoods != null && listGoods.size() > 0 && listGoodsBrief != null && listGoodsBrief.size() > 0) {
+
+ if (classId == 1) {
+ dynamicInfo.setListGoodsBrief(listGoods);
+ } else {
+ for (int i =0; i < listGoodsBrief.size(); i ++) {
+ TaoBaoGoodsBrief taoBaoGoodsBrief = listGoodsBrief.get(i);
+ Long auctionId = taoBaoGoodsBrief.getAuctionId();
+
+ boolean isadd = true;
+ for (TaoBaoGoodsBrief goods: listGoods) {
+ if(goods.getAuctionId().equals(auctionId) || goods.getAuctionId() == auctionId) {
+ isadd = false;
+ break;
+ }
+ }
+
+ // 鍟嗗搧宸蹭笅鏋� 鍒欐坊鍔犲師鏉ュ晢鍝佷俊鎭�
+ if (isadd) {
+ listGoods.add(taoBaoGoodsBrief);
+ }
+ }
+ dynamicInfo.setListGoodsBrief(listGoods);
+ }
}
dynamicInfo.setImgs(imgs);
--
Gitblit v1.8.0