From bd331a582851cffcce54316e677e23760de4f384 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:36:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java | 352 ++++++++++++++++++++++++++++------------------------------
1 files changed, 170 insertions(+), 182 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 d84a845..212de38 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
@@ -18,6 +18,7 @@
import com.yeshi.fanli.dao.dynamic.DynamicInfoDao;
import com.yeshi.fanli.dto.taobao.TaoBaoShopDTO;
+import com.yeshi.fanli.entity.bus.activity.ActivityRuleUser;
import com.yeshi.fanli.entity.bus.activity.ActivityUser;
import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
import com.yeshi.fanli.entity.bus.activity.RecommendActivityInviteInfo;
@@ -56,16 +57,16 @@
@Service
public class DynamicInfoServiceImpl implements DynamicInfoService {
-
+
@Resource(name = "taskExecutor")
private TaskExecutor executor;
-
+
@Resource
private DynamicInfoDao dynamicInfoDao;
@Resource
private RedisManager redisManager;
-
+
@Resource
private DaTaoKeGoodsService daTaoKeGoodsService;
@@ -77,50 +78,47 @@
@Resource
private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
-
+
@Resource
private HongBaoManageService hongBaoManageService;
-
+
@Resource
private TaoBaoShopService taoBaoShopService;
-
+
@Resource
private InviteMaterialService inviteMaterialService;
-
+
@Resource
private QrCodeService qrCodeService;
-
+
@Resource
private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
-
-
+
@Override
public void insert(DynamicInfo record) {
- dynamicInfoDao.insert(record);
+ dynamicInfoDao.insert(record);
}
-
-
+
@Override
public DynamicInfo getById(String id) {
return dynamicInfoDao.getById(id);
}
-
-
+
@Override
public void insertTimeInvite() {
InviteMaterial inviteMaterial = inviteMaterialService.getInviteMaterial();
if (inviteMaterial == null) {
return;
}
-
+
Date date = new Date();
String materialId = inviteMaterial.getId();
String content = inviteMaterial.getText();
-
- ActivityUser user=activityUserService.selectByPrimaryKey(2L);
-
+
+ ActivityUser user = activityUserService.selectByPrimaryKey(2L);
+
if (!StringUtil.isNullOrEmpty(content)) {
- DynamicInfo dynamicTxt= new DynamicInfo();
+ DynamicInfo dynamicTxt = new DynamicInfo();
dynamicTxt.setId(UUID.randomUUID().toString().replace("-", ""));
dynamicTxt.setInviteMaterialId(materialId);
dynamicTxt.setClassId(4L);
@@ -131,9 +129,9 @@
dynamicTxt.setShareCount(1000 + (int) (Math.random() * 8000));
dynamicTxt.setCreateTime(date);
dynamicTxt.setUpdateTime(date);
-
+
SimpleDateFormat format = new SimpleDateFormat("MM鏈坉d鏃�");
-
+
StringBuffer buffer = new StringBuffer();
buffer.append("-------------------\n");
buffer.append("浠婂ぉ : " + format.format(date));
@@ -144,24 +142,24 @@
buffer.append("鏃╁畨锝瀄n");
buffer.append("鎴戠殑閭�璇风爜锛氥�愰個璇风爜銆慭n");
buffer.append("璐墿鐪侀挶杩斿埄鍒窤pp锛氥�愰個璇烽摼鎺ャ��");
-
- content = content.replaceAll("\\,", "\\锛�").replaceAll("\\.", "\\銆�") .replaceAll("\\;", "\\锛�")
+
+ content = content.replaceAll("\\,", "\\锛�").replaceAll("\\.", "\\銆�").replaceAll("\\;", "\\锛�")
.replaceAll("\\!", "\\锛�").replaceAll("\\?", "\\锛�").replaceAll("\\:", "\\锛�");
-
+
ClientTextStyleVO row1 = new ClientTextStyleVO();
row1.setColor("#333333");
row1.setContent(content + "\n" + buffer.toString());
List<ClientTextStyleVO> listtitle = new ArrayList<ClientTextStyleVO>();
listtitle.add(row1);
dynamicTxt.setTitle(listtitle);
-
+
// 绌烘暟鎹�
List<GoodsPicture> listImg = new ArrayList<GoodsPicture>();
dynamicTxt.setImgs(listImg);
-
+
dynamicInfoDao.insert(dynamicTxt);
}
-
+
String picture = inviteMaterial.getPicture();
if (!StringUtil.isNullOrEmpty(picture)) {
DynamicInfo dynamicPic = new DynamicInfo();
@@ -175,14 +173,14 @@
dynamicPic.setShareCount(1000 + (int) (Math.random() * 8000));
dynamicPic.setCreateTime(date);
dynamicPic.setUpdateTime(date);
-
+
try {
// 鐢诲浘
String url = qrCodeService.drawInviteToGreet(picture, null, null, null, content, new Date());
-
+
List<ClientTextStyleVO> listtitle = new ArrayList<ClientTextStyleVO>();
dynamicPic.setTitle(listtitle);
-
+
GoodsPicture p2 = new GoodsPicture();
p2.setW(100);
p2.setH(100);
@@ -192,7 +190,7 @@
List<GoodsPicture> listImg = new ArrayList<GoodsPicture>();
listImg.add(p2);
dynamicPic.setImgs(listImg);
-
+
dynamicInfoDao.insert(dynamicPic);
} catch (Exception e) {
try {
@@ -206,7 +204,6 @@
inviteMaterialService.updateState(1, materialId);
}
-
@Override
public void insertShopInfo() {
List<String> brandIdList = DaTaoKeApiUtil.getBrandIdList();
@@ -214,8 +211,7 @@
LogHelper.test("澶ф窐瀹㈠搧鐗宨d鑾峰彇澶辫触锛圖ynamicInfoService-insertShopInfo锛�");
return;
}
-
-
+
Long classId = 3L;
Long subclassId = 0L;
List<DynamicInfo> listInfo = dynamicInfoDao.query(classId, subclassId);
@@ -224,41 +220,40 @@
if (listInfo != null && listInfo.size() > 0) {
for (int i = 0; i < brandIdList.size(); i++) {
String brandId = brandIdList.get(i);
-
+
for (int j = 0; j < listInfo.size(); j++) {
String id = listInfo.get(j).getId();
if (brandId.equals(id)) {
brandIdList.remove(brandId);
i--;
-
+
listInfo.remove(listInfo.get(j));
j--;
}
}
}
}
-
+
if (brandIdList == null || brandIdList.size() == 0) {
LogHelper.test("澶ф窐瀹㈠搧鐗屽凡鍏ㄩ儴鐖彇锛圖ynamicInfoService-insertShopInfo锛�");
return;
}
-
+
int index = (int) (Math.random() * brandIdList.size());
String brandId = brandIdList.get(index);
-
+
TaoBaoShopDTO dynamicShopInfo = DaTaoKeApiUtil.getDynamicShopInfo(brandId);
if (dynamicShopInfo == null) {
LogHelper.test("澶ф窐瀹㈠搧鐗屼俊鎭埇鍙栧け璐ワ紙DynamicInfoService-insertShopInfo锛�");
return;
}
-
-
+
List<TaoBaoGoodsBrief> listGoods = dynamicShopInfo.getListGoods();
if (listGoods == null || listGoods.size() == 0) {
LogHelper.test("澶ф窐瀹㈠搧鐗屽晢鍝佷俊鎭埇鍙栧け璐ワ紙DynamicInfoService-insertShopInfo锛�");
return;
}
-
+
Long sellerId = dynamicShopInfo.getSellerId();
TaoBaoGoodsBrief taoBaoGoodsBrief = listGoods.get(0);
TaoBaoShop taoBaoShop = taoBaoShopService.getTaoBaoShop(taoBaoGoodsBrief.getAuctionId(), sellerId);
@@ -270,17 +265,18 @@
if (StringUtil.isNullOrEmpty(shopLink)) {
taoBaoShop.setShopLink(TaoBaoUtil.getShopLink(taoBaoShop.getId()));
}
-
+
DynamicInfo dynamicVO = new DynamicInfo();
dynamicVO.setId(brandId);
dynamicVO.setClassId(classId);
dynamicVO.setSubclassId(subclassId);
dynamicVO.setShowType(DynamicInfo.SHOW_TYPE_TWO);
dynamicVO.setShop(taoBaoShop);
- dynamicVO.setUser(activityUserService.listRand(1).get(0));
- dynamicVO.setCreateTime(DateUtil.reduceRandomMinute(new Date(), 8));
+ List<ActivityRuleUser> userList = activityUserService.listByRuleCode(ActivityRuleUser.RULE_HAODIAN, 1, 50);
+ dynamicVO.setUser(userList.get((int) (userList.size() * Math.random())).getActivityUser());
+ dynamicVO.setCreateTime(DateUtil.reduceRandomMinute(new Date(), 8));
dynamicVO.setUpdateTime(new Date());
-
+
// 浠嬬粛鍐呭
ClientTextStyleVO row1 = new ClientTextStyleVO();
row1.setColor("#333333");
@@ -288,24 +284,25 @@
List<ClientTextStyleVO> listTitle = new ArrayList<ClientTextStyleVO>();
listTitle.add(row1);
dynamicVO.setTitle(listTitle);
-
+
// 鍟嗗搧淇℃伅
List<GoodsPicture> listPicture = new ArrayList<GoodsPicture>();
for (TaoBaoGoodsBrief goodsBrief : listGoods) {
BigDecimal proportion = hongBaoManageService.getFanLiRate();
- TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion.toString(), null);
+ TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief,
+ proportion.toString(), null);
taoBaoGoodsBriefExtra.setCouponInfo(null);
taoBaoGoodsBriefExtra.setUpdatetime(new Date());
-
+
if (!taoBaoGoodsBriefExtra.isCoupon()) {
taoBaoGoodsBriefExtra.setState(1);
}
-
+
String goodsId = goodsBrief.getAuctionId().toString();
JSONObject item = new JSONObject();
item.put("id", goodsId);
item.put("from", "dynamics");
-
+
GoodsPicture goodsPicture = new GoodsPicture();
goodsPicture.setH(100);
goodsPicture.setW(100);
@@ -313,16 +310,14 @@
goodsPicture.setJumpDetail(jumpDetailV2Service.getByTypeCache("goodsdetail"));
goodsPicture.setParams(item.toString());
goodsPicture.setGoods(taoBaoGoodsBriefExtra);
-
+
listPicture.add(goodsPicture);
}
dynamicVO.setImgs(listPicture);
-
+
dynamicInfoDao.insert(dynamicVO);
}
-
-
-
+
@Override
public void insertTimeRecommend() {
try {
@@ -330,7 +325,7 @@
List<GoodsClass> list = DaTaoKeUtil.goodsClasses;
int index = (int) (Math.random() * list.size());
Long subclassId = list.get(index).getId();
- int cid = Integer.parseInt(subclassId +"");
+ int cid = Integer.parseInt(subclassId + "");
int count = 0;
double random = Math.random();
if (random > 0.4) {
@@ -357,12 +352,13 @@
// 鍒嗕韩濂栭噾
TaoBaoGoodsBrief taoBaoGoodsBrief = TaoBaoUtil.convert(daTaoKe);
listGoods.add(taoBaoGoodsBrief);
-
- TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null);
+
+ TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,
+ proportion.toString(), null);
if (!taoBaoGoodsBriefExtra.isCoupon()) {
taoBaoGoodsBriefExtra.setState(1);
}
-
+
BigDecimal money = taoBaoGoodsBriefService.getShareGoodsUserHongBao(taoBaoGoodsBrief);
shareMoney = MoneyBigDecimalUtil.add(shareMoney, money);
// 鍟嗗搧鍥剧墖
@@ -370,7 +366,7 @@
taoBaoGoodsBriefExtra.setCouponInfo(null);
GoodsPicture goodsPicture = getGoodsPicture(daTaoKe);
goodsPicture.setGoods(taoBaoGoodsBriefExtra);
-
+
listPicture.add(goodsPicture);
}
@@ -463,14 +459,15 @@
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);
+ TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,
+ proportion.toString(), null);
if (!taoBaoGoodsBriefExtra.isCoupon()) {
taoBaoGoodsBriefExtra.setState(1);
}
taoBaoGoodsBriefExtra.setTkRate(taoBaoGoodsBrief.getTkRate());
-
+
// 鍒嗕韩濂栭噾
BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(taoBaoGoodsBrief);
ClientTextStyleVO shareMoneyDesc = new ClientTextStyleVO();
@@ -501,7 +498,7 @@
if (pic.equals(img)) {
continue;
}
-
+
listimgs.add(img);
GoodsPicture picture = new GoodsPicture();
picture.setH(100);
@@ -510,7 +507,7 @@
listPicture.add(picture);
}
}
-
+
taoBaoGoodsBriefExtra.setImgList(imgList);
// 缁勭粐鍔ㄦ�佷俊鎭�
@@ -521,12 +518,12 @@
dynamicInfo.setShareType(DynamicInfo.SHARE_TYPE_ONE);
dynamicInfo.setShowType(DynamicInfo.SHOW_TYPE_TWO);
dynamicInfo.setListGoodsBrief(listGoods);
-
+
String desc = DaTaoKeUtil.getDesc(daTaoKe);
if (!StringUtil.isNullOrEmpty(desc)) {
int index = desc.lastIndexOf("\n");
String newDesc = desc.substring(index + 1);
- if(StringUtil.isNullOrEmpty(newDesc)) {
+ if (StringUtil.isNullOrEmpty(newDesc)) {
desc = desc.substring(0, index);
}
}
@@ -585,7 +582,7 @@
goodsPicture.setW(100);
goodsPicture.setUrl(TbImgUtil.getTBSize320Img(daTaoKe.getPic()));
goodsPicture.setJumpDetail(jumpDetailV2Service.getByTypeCache("goodsdetail"));
-
+
String goodsId = daTaoKe.getGoodsId().toString();
JSONObject item = new JSONObject();
item.put("id", goodsId);
@@ -594,27 +591,25 @@
return goodsPicture;
}
-
-
@Override
- public void insertInviteActivity(RecommendActivity activity) throws Exception{
-
+ public void insertInviteActivity(RecommendActivity activity) throws Exception {
+
String title = activity.getTitle();
-
+
String picUrl = null;
List<String> imageList = activity.getImageList();
if (imageList != null && imageList.size() > 0) {
picUrl = imageList.get(0);
}
-
+
if (StringUtil.isNullOrEmpty(title) || StringUtil.isNullOrEmpty(picUrl)) {
return;
}
-
+
// 鍒ゆ柇鏄惁宸插瓨鍦�
String dynamicInfoId = null;
-
- Long activityId = activity.getId();
+
+ Long activityId = activity.getId();
DynamicInfo dynamicVO = dynamicInfoDao.getByActivityId(activityId);
if (dynamicVO == null) {
dynamicVO = new DynamicInfo();
@@ -623,35 +618,34 @@
} else {
dynamicInfoId = dynamicVO.getId();
}
-
+
if (!StringUtil.isNullOrEmpty(title)) {
title = title.replaceAll("<p>", "").replaceAll("</p>", "").replaceAll("<br>", "\n");
-
+
int index = title.lastIndexOf("\n");
String newDesc = title.substring(index + 1);
- if(StringUtil.isNullOrEmpty(newDesc)) {
+ if (StringUtil.isNullOrEmpty(newDesc)) {
title = title.substring(0, index);
}
-
- title = title.replaceAll("\\,", "\\锛�").replaceAll("\\.", "\\銆�") .replaceAll("\\;", "\\锛�")
+
+ title = title.replaceAll("\\,", "\\锛�").replaceAll("\\.", "\\銆�").replaceAll("\\;", "\\锛�")
.replaceAll("\\!", "\\锛�").replaceAll("\\?", "\\锛�").replaceAll("\\:", "\\锛�");
}
-
+
dynamicVO.setId(UUID.randomUUID().toString().replace("-", ""));
dynamicVO.setActivityId(activityId);
dynamicVO.setClassId(4L);
dynamicVO.setSubclassId(0L);
dynamicVO.setShareType(DynamicInfo.SHARE_TYPE_INVITE);
dynamicVO.setUpdateTime(new Date());
-
-
+
Integer shareCount = activity.getShareCount();
if (shareCount == null || shareCount <= 0) {
dynamicVO.setShareCount(1000 + (int) (Math.random() * 8000));
} else {
dynamicVO.setShareCount(shareCount);
}
-
+
// 鍙戝竷鐢ㄦ埛
ActivityUser activityUser = activity.getActivityUser();
if (activityUser == null) {
@@ -659,27 +653,25 @@
} else {
dynamicVO.setUser(activityUser);
}
-
-
+
// 浠嬬粛鍐呭
List<ClientTextStyleVO> listtitle = new ArrayList<ClientTextStyleVO>();
- if(!StringUtil.isNullOrEmpty(title)) {
+ if (!StringUtil.isNullOrEmpty(title)) {
ClientTextStyleVO row1 = new ClientTextStyleVO();
row1.setColor("#333333");
- row1.setContent(title );
+ row1.setContent(title);
listtitle.add(row1);
}
-
-
+
// 鍥剧墖
List<GoodsPicture> listImg = new ArrayList<GoodsPicture>();
- if(StringUtil.isNullOrEmpty(picUrl)) {
+ if (StringUtil.isNullOrEmpty(picUrl)) {
dynamicVO.setShowType(DynamicInfo.SHOW_TYPE_ZERO);
} else {
dynamicVO.setShowType(DynamicInfo.SHOW_TYPE_ONE);
RecommendActivityInviteInfo inviteInfo = activity.getInviteInfo();
-
- Integer pX = null;
+
+ Integer pX = null;
Integer pY = null;
Integer size = null;
if (inviteInfo != null) {
@@ -687,9 +679,9 @@
pY = inviteInfo.getPy();
size = inviteInfo.getSize();
}
-
+
// 鍥剧墖
- String imgLink = qrCodeService.drawInviteQrCodeNew(picUrl , null, null, pX, pY, size, null);
+ String imgLink = qrCodeService.drawInviteQrCodeNew(picUrl, null, null, pX, pY, size, null);
GoodsPicture p2 = new GoodsPicture();
p2.setW(100);
p2.setH(100);
@@ -698,27 +690,26 @@
p2.setPx(pX);
p2.setPy(pY);
p2.setSize(size);
-
+
listImg.add(p2);
}
-
+
dynamicVO.setImgs(listImg);
dynamicVO.setTitle(listtitle);
-
+
if (!StringUtil.isNullOrEmpty(dynamicInfoId)) {
dynamicInfoDao.deleteById(dynamicInfoId);
}
-
+
dynamicInfoDao.insert(dynamicVO);
}
-
-
+
@Override
public void insertActivityRecommend(RecommendActivity activity) {
if (activity == null || activity.getGoodsList() == null) {
return;
}
-
+
try {
String dynamicInfoId = null;
DynamicInfo dynamicInfo = dynamicInfoDao.getByActivityId(activity.getId());
@@ -729,42 +720,40 @@
} else {
dynamicInfoId = dynamicInfo.getId();
}
-
+
dynamicInfo.setClassId(2L);
dynamicInfo.setSubclassId(0L);
dynamicInfo.setUser(activity.getActivityUser());
dynamicInfo.setActivityId(activity.getId());
dynamicInfo.setUpdateTime(new Date());
-
-
+
List<ClientTextStyleVO> listtitle = new ArrayList<ClientTextStyleVO>();
String title = activity.getTitle();
if (!StringUtil.isNullOrEmpty(title)) {
title = title.replaceAll("<p>", "");
title = title.replaceAll("</p>", "");
title = title.replaceAll("<br>", "\n");
-
+
int index = title.lastIndexOf("\n");
String newDesc = title.substring(index + 1);
- if(StringUtil.isNullOrEmpty(newDesc)) {
+ if (StringUtil.isNullOrEmpty(newDesc)) {
title = title.substring(0, index);
}
-
+
ClientTextStyleVO row1 = new ClientTextStyleVO();
row1.setColor("#333333");
- row1.setContent(title );
+ row1.setContent(title);
listtitle.add(row1);
}
dynamicInfo.setTitle(listtitle);
-
-
+
Integer shareCount = activity.getShareCount();
if (shareCount == null || shareCount <= 0) {
dynamicInfo.setShareCount(1000 + (int) (Math.random() * 8000));
} else {
dynamicInfo.setShareCount(shareCount);
}
-
+
// 鍙戝竷鐢ㄦ埛
ActivityUser activityUser = activity.getActivityUser();
if (activityUser == null) {
@@ -782,36 +771,38 @@
if (activity.getGoodsList() != null) {
for (RecommendActivityTaoBaoGoods activityGoods : activity.getGoodsList()) {
-
+
TaoBaoGoodsBrief taoBaoGoodsBrief = null;
- TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = null;
+ TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = null;
String auctionId = activityGoods.getAuctionId();
try {
taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(Long.parseLong(auctionId));
-
- taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null);
+
+ taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,
+ proportion.toString(), null);
if (!taoBaoGoodsBriefExtra.isCoupon()) {
taoBaoGoodsBriefExtra.setState(1);
}
-
+
BigDecimal money = taoBaoGoodsBriefService.getShareGoodsUserHongBao(taoBaoGoodsBrief);
shareMoney = MoneyBigDecimalUtil.add(shareMoney, money);
} catch (TaobaoGoodsDownException e) {
- taoBaoGoodsBrief = activityGoods.getTaoBaoGoodsBrief();
- taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null);
- taoBaoGoodsBriefExtra.setState(1);
- taoBaoGoodsBriefExtra.setCoupon(false);
+ taoBaoGoodsBrief = activityGoods.getTaoBaoGoodsBrief();
+ taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,
+ proportion.toString(), null);
+ taoBaoGoodsBriefExtra.setState(1);
+ taoBaoGoodsBriefExtra.setCoupon(false);
}
listGoods.add(taoBaoGoodsBrief);
-
+
// 鍟嗗搧鍥剧墖
taoBaoGoodsBriefExtra.setCouponInfo(null);
taoBaoGoodsBriefExtra.setUpdatetime(new Date());
-
+
JSONObject item = new JSONObject();
item.put("id", auctionId);
item.put("from", "dynamics");
-
+
GoodsPicture goodsPicture = new GoodsPicture();
goodsPicture.setH(100);
goodsPicture.setW(100);
@@ -819,13 +810,13 @@
goodsPicture.setJumpDetail(jumpDetailV2Service.getByTypeCache("goodsdetail"));
goodsPicture.setParams(item.toString());
goodsPicture.setGoods(taoBaoGoodsBriefExtra);
-
+
listPicture.add(goodsPicture);
}
}
dynamicInfo.setImgs(listPicture);
dynamicInfo.setListGoodsBrief(listGoods);
-
+
ClientTextStyleVO shareMoneyDesc = new ClientTextStyleVO();
shareMoneyDesc.setColor("#FFFFFF");
shareMoneyDesc.setBottomColor("#E8AE48");
@@ -840,8 +831,7 @@
dynamicInfo.setShowType(DynamicInfo.SHOW_TYPE_THREE);
dynamicInfo.setShareType(DynamicInfo.SHARE_TYPE_NINE); // 鍒嗕韩绫诲瀷9鍥�
}
-
-
+
if (!StringUtil.isNullOrEmpty(dynamicInfoId)) {
dynamicInfoDao.deleteById(dynamicInfoId);
}
@@ -856,8 +846,7 @@
}
}
}
-
-
+
@Override
public void deleteActivity(Long activityId) {
DynamicInfo dynamicInfo = dynamicInfoDao.getByActivityId(activityId);
@@ -866,18 +855,17 @@
dynamicInfoDao.deleteById(dynamicInfo.getId());
}
}
-
-
+
@Override
public void removeByDate(Date createTime) {
dynamicInfoDao.removeByDate(createTime);
}
-
+
@Override
public void updateShareCount(DynamicInfo record) {
dynamicInfoDao.updateShareCount(record);
}
-
+
@Override
@Cacheable(value = "dynamicCache", key = "'count-'+#cid+'-'+#subId")
public long count(Long cid, Long subId) {
@@ -888,7 +876,7 @@
@Cacheable(value = "dynamicCache", key = "'query-'+#start+'-'+#count+'-'+#cid+'-'+#subId")
public List<DynamicInfo> query(int start, int count, Long cid, Long subId) {
List<DynamicInfo> list = dynamicInfoDao.query(start, count, cid, subId);
-
+
// 鏇存柊鍟嗗搧淇℃伅
executor.execute(new Runnable() {
@Override
@@ -896,81 +884,80 @@
updateGoodInfo(list);
}
});
-
+
return list;
}
-
-
+
/**
* 鏇存柊鍟嗗搧淇℃伅
*/
public void updateGoodInfo(List<DynamicInfo> list) {
-
+
// 澶栫綉杩涜鏇存柊
if (!Constant.IS_OUTNET) {
return;
}
-
+
if (list == null || list.size() == 0) {
return;
}
-
+
BigDecimal proportion = hongBaoManageService.getFanLiRate();
- for (DynamicInfo dynamicInfo: list) {
+ for (DynamicInfo dynamicInfo : list) {
// 閭�璇锋暟鎹笉鍋氭洿鏂�
long classId = dynamicInfo.getClassId();
if (classId == 4) {
break;
}
-
+
// 鏇存柊鍟嗗搧淇℃伅
List<GoodsPicture> imgs = dynamicInfo.getImgs();
if (imgs == null || imgs.size() == 0) {
continue;
}
-
+
// 鏄惁涓�涓皬鏃朵箣鍐呭凡鏇存柊
Date updateTime = dynamicInfo.getUpdateTime();
if (updateTime != null) {
- long nd = 1000 * 24 * 60 * 60;// 涓�澶╃殑姣鏁�
- long nh = 1000 * 60 * 60;// 涓�灏忔椂鐨勬绉掓暟
- long diff = System.currentTimeMillis() - updateTime.getTime();
- long day = diff / nd;// 璁＄畻宸灏戝ぉ
- long hour = diff % nd / nh + day * 24;// 璁＄畻宸灏戝皬鏃�
+ long nd = 1000 * 24 * 60 * 60;// 涓�澶╃殑姣鏁�
+ long nh = 1000 * 60 * 60;// 涓�灏忔椂鐨勬绉掓暟
+ long diff = System.currentTimeMillis() - updateTime.getTime();
+ long day = diff / nd;// 璁＄畻宸灏戝ぉ
+ long hour = diff % nd / nh + day * 24;// 璁＄畻宸灏戝皬鏃�
if (hour < 1) {
continue;
}
}
-
+
// 宸蹭笅鏋禝D
List<Long> listDown = new ArrayList<Long>();
// 鍟嗗搧鍒楄〃
List<TaoBaoGoodsBrief> listGoods = new ArrayList<TaoBaoGoodsBrief>();
-
- for (GoodsPicture goodsPicture: imgs) {
+
+ for (GoodsPicture goodsPicture : imgs) {
TaoBaoGoodsBriefExtra oldExtra = goodsPicture.getGoods();
if (oldExtra == null) {
continue;
}
-
+
Integer state = oldExtra.getState();
if (state != null && state == 1) {
continue;
}
-
+
try {
TaoBaoGoodsBrief goodsBrief = redisManager.getTaoBaoGoodsBrief(oldExtra.getAuctionId());
-
+
// 鏇存柊鍟嗗搧淇℃伅
try {
taoBaoGoodsUpdateService.updateTaoBaoGoods(goodsBrief);
} catch (Exception e) {
e.printStackTrace();
}
-
+
listGoods.add(goodsBrief);
-
- // 鏇存柊鐑攢鍗曞搧鐨勫垎浜閲� 锛屽叾浣欎笉鍋氭洿鏂�
+
+ // 鏇存柊鐑攢鍗曞搧鐨勫垎浜閲� 锛屽叾浣欎笉鍋氭洿鏂�
if (classId == 1) {
BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(goodsBrief);
ClientTextStyleVO shareMoneyDesc = new ClientTextStyleVO();
@@ -979,27 +966,28 @@
shareMoneyDesc.setContent("棰勪及鍒嗕韩濂栭噾锛毬�" + shareMoney);
dynamicInfo.setDesc(shareMoneyDesc);
}
-
- TaoBaoGoodsBriefExtra newExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion.toString(), null);
-
+
+ TaoBaoGoodsBriefExtra newExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief,
+ proportion.toString(), null);
+
if (!newExtra.isCoupon()) {
newExtra.setState(1);
}
newExtra.setUpdatetime(new Date());
goodsPicture.setGoods(oldExtra);
-
+
} catch (TaobaoGoodsDownException e) {
listDown.add(oldExtra.getAuctionId());
-
+
oldExtra.setState(1);
oldExtra.setCoupon(false);
oldExtra.setUpdatetime(new Date());
goodsPicture.setGoods(oldExtra);
-
+
// 鍟嗗搧鐪熷疄涓嬫灦
goodsPicture.setGoodState(1);
-
- // 鏇存柊鐑攢鍗曞搧鐨勫垎浜閲� 锛屽叾浣欎笉鍋氭洿鏂�
+
+ // 鏇存柊鐑攢鍗曞搧鐨勫垎浜閲� 锛屽叾浣欎笉鍋氭洿鏂�
if (classId == 1) {
ClientTextStyleVO shareMoneyDesc = new ClientTextStyleVO();
shareMoneyDesc.setColor("#FFFFFF");
@@ -1011,27 +999,27 @@
}
}
dynamicInfo.setImgs(imgs);
-
+
// 鍟嗗搧宸蹭笅鏋�
List<TaoBaoGoodsBrief> listGoodsBrief = dynamicInfo.getListGoodsBrief();
if (listGoodsBrief != null && listGoodsBrief.size() > 0) {
-
- if (listGoods.size() > 0 ) {
+
+ if (listGoods.size() > 0) {
if (classId == 1) {
dynamicInfo.setListGoodsBrief(listGoods);
} else {
- for (int i =0; i < listGoodsBrief.size(); i ++) {
+ 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) {
+ 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())) {
@@ -1044,7 +1032,7 @@
}
} else {
if (listDown.size() > 0) {
- for (TaoBaoGoodsBrief taoBaoGoodsBrief: listGoodsBrief) {
+ for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoodsBrief) {
if (listDown.contains(taoBaoGoodsBrief.getAuctionId())) {
taoBaoGoodsBrief.setState(1);
}
@@ -1053,10 +1041,10 @@
}
}
}
-
+
dynamicInfo.setUpdateTime(new Date());
dynamicInfoDao.updateGoodInfo(dynamicInfo);
}
}
-
+
}
--
Gitblit v1.8.0