From 1e92eff67b997263ecefa255c63eb6641c47b57f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 14 六月 2019 10:22:33 +0800
Subject: [PATCH] 设备消息BUG解决，品牌
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java | 95 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 68 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..d84a845 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
@@ -38,9 +38,11 @@
import com.yeshi.fanli.service.inter.dynamic.InviteMaterialService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;
import com.yeshi.fanli.service.inter.user.QrCodeService;
+import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
@@ -87,6 +89,9 @@
@Resource
private QrCodeService qrCodeService;
+
+ @Resource
+ private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
@Override
@@ -140,7 +145,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 +625,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("-", ""));
@@ -897,6 +905,12 @@
* 鏇存柊鍟嗗搧淇℃伅
*/
public void updateGoodInfo(List<DynamicInfo> list) {
+
+ // 澶栫綉杩涜鏇存柊
+ if (!Constant.IS_OUTNET) {
+ return;
+ }
+
if (list == null || list.size() == 0) {
return;
}
@@ -928,6 +942,8 @@
}
}
+ // 宸蹭笅鏋禝D
+ List<Long> listDown = new ArrayList<Long>();
// 鍟嗗搧鍒楄〃
List<TaoBaoGoodsBrief> listGoods = new ArrayList<TaoBaoGoodsBrief>();
@@ -944,6 +960,14 @@
try {
TaoBaoGoodsBrief goodsBrief = redisManager.getTaoBaoGoodsBrief(oldExtra.getAuctionId());
+
+ // 鏇存柊鍟嗗搧淇℃伅
+ try {
+ taoBaoGoodsUpdateService.updateTaoBaoGoods(goodsBrief);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
listGoods.add(goodsBrief);
// 鏇存柊鐑攢鍗曞搧鐨勫垎浜閲� 锛屽叾浣欎笉鍋氭洿鏂�
@@ -962,9 +986,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 +1010,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