From d0bfdeda7f4f3b9f1685664d42c7592b533d8957 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 22 五月 2019 17:04:32 +0800
Subject: [PATCH] 新版、老版动态分享 + 选品库分享+商品详情分享 优化
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 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 a544732..fd0b0b6 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
@@ -129,7 +129,7 @@
SimpleDateFormat format = new SimpleDateFormat("MM鏈坉d鏃�");
StringBuffer buffer = new StringBuffer();
- buffer.append("------------------------------------------\n");
+ buffer.append("-------------------\n");
buffer.append("浠婂ぉ : " + format.format(date));
buffer.append(" ");
buffer.append(DateLunarUtil.getWeekd(date) + "\n");
@@ -336,7 +336,8 @@
DaTaoKeDetail daTaoKeDetail = null;
// 鍟嗗搧鍒楄〃
List<GoodsPicture> listPicture = new ArrayList<GoodsPicture>();
-
+ // 鍟嗗搧鍒楄〃
+ List<TaoBaoGoodsBrief> listGoods = new ArrayList<TaoBaoGoodsBrief>();
// 鍒嗕韩濂栭噾
BigDecimal shareMoney = new BigDecimal(0);
@@ -346,8 +347,9 @@
daTaoKeDetail = daTaoKe;
}
// 鍒嗕韩濂栭噾
-
TaoBaoGoodsBrief taoBaoGoodsBrief = TaoBaoUtil.convert(daTaoKe);
+ listGoods.add(taoBaoGoodsBrief);
+
TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null);
if (!taoBaoGoodsBriefExtra.isCoupon()) {
taoBaoGoodsBriefExtra.setState(1);
@@ -371,6 +373,7 @@
// 鍙戝竷鐢ㄦ埛
dynamicInfo.setUser(activityUserService.getRandomByDaTaoKeCid(cid));
dynamicInfo.setImgs(listPicture);
+ dynamicInfo.setListGoodsBrief(listGoods);
ClientTextStyleVO shareMoneyDesc = new ClientTextStyleVO();
shareMoneyDesc.setColor("#FFFFFF");
@@ -449,13 +452,16 @@
// 澶ф窐瀹㈡暟鎹�
DaTaoKeDetail daTaoKe = daTaoKeGoodsService.getGoodsNotInList(subclassId, listId, 1).get(0);
-
+ List<TaoBaoGoodsBrief> listGoods = new ArrayList<TaoBaoGoodsBrief>();
TaoBaoGoodsBrief taoBaoGoodsBrief = TaoBaoUtil.convert(daTaoKe);
+ listGoods.add(taoBaoGoodsBrief);
+
BigDecimal proportion = hongBaoManageService.getFanLiRate();
TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null);
if (!taoBaoGoodsBriefExtra.isCoupon()) {
taoBaoGoodsBriefExtra.setState(1);
}
+ taoBaoGoodsBriefExtra.setTkRate(taoBaoGoodsBrief.getTkRate());
// 鍒嗕韩濂栭噾
BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(taoBaoGoodsBrief);
@@ -506,6 +512,7 @@
dynamicInfo.setDesc(shareMoneyDesc);
dynamicInfo.setShareType(DynamicInfo.SHARE_TYPE_ONE);
dynamicInfo.setShowType(DynamicInfo.SHOW_TYPE_TWO);
+ dynamicInfo.setListGoodsBrief(listGoods);
String desc = DaTaoKeUtil.getDesc(daTaoKe);
if (!StringUtil.isNullOrEmpty(desc)) {
@@ -633,9 +640,22 @@
dynamicVO.setShowType(DynamicInfo.SHOW_TYPE_ZERO);
// 浠嬬粛鍐呭
+ SimpleDateFormat format = new SimpleDateFormat("MM鏈坉d鏃�");
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("-------------------\n");
+ buffer.append("浠婂ぉ : " + format.format(new Date()));
+ buffer.append(" ");
+ buffer.append(DateLunarUtil.getWeekd(new Date()) + "\n");
+ buffer.append("鍚勪綅浜茬埍鐨勪綘");
+ buffer.append(" ");
+ buffer.append("鏃╁畨锝瀄n");
+ buffer.append("鎴戠殑閭�璇风爜锛氥�愰個璇风爜銆慭n");
+ buffer.append("璐墿鐪侀挶杩斿埄鍒窤pp锛氥�愰個璇烽摼鎺ャ��");
+
ClientTextStyleVO row1 = new ClientTextStyleVO();
row1.setColor("#333333");
- row1.setContent(title);
+ row1.setContent(title + "\n" + buffer.toString());
+
listtitle.add(row1);
dynamicVO.setTitle(listtitle);
dynamicInfoDao.insert(dynamicVO);
@@ -732,6 +752,7 @@
newExtra.setState(1);
}
newExtra.setUpdatetime(new Date());
+ newExtra.setTkRate(goodsBrief.getTkRate());
goodsPicture.setGoods(newExtra);
@@ -812,6 +833,7 @@
dynamicInfo.setShareCount(1000 + (int) (Math.random() * 8000));
}
+ List<TaoBaoGoodsBrief> listGoods = new ArrayList<TaoBaoGoodsBrief>();
// 鍟嗗搧鍒楄〃
List<GoodsPicture> listPicture = new ArrayList<GoodsPicture>();
BigDecimal proportion = hongBaoManageService.getFanLiRate();
@@ -840,6 +862,8 @@
taoBaoGoodsBriefExtra.setState(1);
taoBaoGoodsBriefExtra.setCoupon(false);
}
+ listGoods.add(taoBaoGoodsBrief);
+
// 鍟嗗搧鍥剧墖
taoBaoGoodsBriefExtra.setCouponInfo(null);
taoBaoGoodsBriefExtra.setUpdatetime(new Date());
@@ -860,7 +884,7 @@
}
}
dynamicInfo.setImgs(listPicture);
-
+ dynamicInfo.setListGoodsBrief(listGoods);
ClientTextStyleVO shareMoneyDesc = new ClientTextStyleVO();
shareMoneyDesc.setColor("#FFFFFF");
@@ -887,8 +911,6 @@
}
}
}
-
-
--
Gitblit v1.8.0