From 0791976274df96a90c1a6ad418c4214b81b939b8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 30 五月 2019 14:18:24 +0800
Subject: [PATCH] 删除空方法
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java | 76 ++++++++++++++++++++++++-------------
1 files changed, 49 insertions(+), 27 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 574dac7..ef609c5 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
@@ -140,7 +140,9 @@
buffer.append("鎴戠殑閭�璇风爜锛氥�愰個璇风爜銆慭n");
buffer.append("璐墿鐪侀挶杩斿埄鍒窤pp锛氥�愰個璇烽摼鎺ャ��");
-
+ content = content.replaceAll("\\,", "\\锛�").replaceAll("\\.", "\\銆�") .replaceAll("\\;", "\\锛�")
+ .replaceAll("\\!", "\\锛�").replaceAll("\\?", "\\锛�").replaceAll("\\:", "\\锛�");
+
ClientTextStyleVO row1 = new ClientTextStyleVO();
row1.setColor("#333333");
row1.setContent(content + "\n" + buffer.toString());
@@ -618,15 +620,16 @@
}
if (!StringUtil.isNullOrEmpty(title)) {
- title = title.replaceAll("<p>", "");
- title = title.replaceAll("</p>", "");
- title = title.replaceAll("<br>", "\n");
+ title = title.replaceAll("<p>", "").replaceAll("</p>", "").replaceAll("<br>", "\n");
int index = title.lastIndexOf("\n");
String newDesc = title.substring(index + 1);
if(StringUtil.isNullOrEmpty(newDesc)) {
title = title.substring(0, index);
}
+
+ title = title.replaceAll("\\,", "\\锛�").replaceAll("\\.", "\\銆�") .replaceAll("\\;", "\\锛�")
+ .replaceAll("\\!", "\\锛�").replaceAll("\\?", "\\锛�").replaceAll("\\:", "\\锛�");
}
dynamicVO.setId(UUID.randomUUID().toString().replace("-", ""));
@@ -928,6 +931,8 @@
}
}
+ // 宸蹭笅鏋禝D
+ List<Long> listDown = new ArrayList<Long>();
// 鍟嗗搧鍒楄〃
List<TaoBaoGoodsBrief> listGoods = new ArrayList<TaoBaoGoodsBrief>();
@@ -962,9 +967,11 @@
newExtra.setState(1);
}
newExtra.setUpdatetime(new Date());
- goodsPicture.setGoods(newExtra);
+ goodsPicture.setGoods(oldExtra);
} catch (TaobaoGoodsDownException e) {
+ listDown.add(oldExtra.getAuctionId());
+
oldExtra.setState(1);
oldExtra.setCoupon(false);
oldExtra.setUpdatetime(new Date());
@@ -984,35 +991,50 @@
e.printStackTrace();
}
}
+ dynamicInfo.setImgs(imgs);
- // 鏇存柊鍟嗗搧
+ // 鍟嗗搧宸蹭笅鏋�
List<TaoBaoGoodsBrief> listGoodsBrief = dynamicInfo.getListGoodsBrief();
- if (listGoods != null && listGoods.size() > 0 && listGoodsBrief != null && listGoodsBrief.size() > 0) {
+ if (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 (listGoods.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) {
+ // 鍟嗗搧宸蹭笅鏋� 鍒欐坊鍔犲師鏉ュ晢鍝佷俊鎭�
+ if (listDown.size() > 0 && listDown.contains(taoBaoGoodsBrief.getAuctionId())) {
+ taoBaoGoodsBrief.setState(1);
+ }
+ listGoods.add(taoBaoGoodsBrief);
+ }
}
-
- // 鍟嗗搧宸蹭笅鏋� 鍒欐坊鍔犲師鏉ュ晢鍝佷俊鎭�
- if (isadd) {
- listGoods.add(taoBaoGoodsBrief);
- }
+ dynamicInfo.setListGoodsBrief(listGoods);
}
- dynamicInfo.setListGoodsBrief(listGoods);
+ } else {
+ if (listDown.size() > 0) {
+ for (TaoBaoGoodsBrief taoBaoGoodsBrief: listGoodsBrief) {
+ if (listDown.contains(taoBaoGoodsBrief.getAuctionId())) {
+ taoBaoGoodsBrief.setState(1);
+ }
+ }
+ dynamicInfo.setListGoodsBrief(listGoodsBrief);
+ }
}
}
- dynamicInfo.setImgs(imgs);
+
dynamicInfo.setUpdateTime(new Date());
dynamicInfoDao.updateGoodInfo(dynamicInfo);
}
--
Gitblit v1.8.0