From b9b613a285ebe0da27ca7dd2c3434c8c917abb74 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 02 四月 2020 11:19:03 +0800
Subject: [PATCH] 订单修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java | 323 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 192 insertions(+), 131 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java
index 5e2f0ca..3ecc09d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java
@@ -70,10 +70,8 @@
import com.yeshi.fanli.util.jd.JDApiUtil;
import com.yeshi.fanli.util.jd.JDUtil;
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
-import com.yeshi.fanli.util.pinduoduo.PinDuoDuoUtil;
import com.yeshi.fanli.util.taobao.DaTaoKeUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.vo.goods.CouponInfoVO;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
@@ -166,6 +164,7 @@
record.setId(id);
record.setShareNumReal(0);
record.setCreateTime(new Date());
+ record.setUpdateTime(new Date());
goodsEvaluateDao.save(record);
} else {
GoodsEvaluate resultObj = goodsEvaluateDao.getById(id);
@@ -179,6 +178,7 @@
resultObj.setStartTime(record.getStartTime());
resultObj.setEndTime(record.getEndTime());
resultObj.setTitle(tilte);
+ resultObj.setUpdateTime(new Date());
goodsEvaluateDao.save(resultObj);
}
return id;
@@ -327,21 +327,28 @@
}
// 缂栬緫鍥剧墖
- List<String> listpic = null;
+ List<String> listpic = new ArrayList<>();
if (!StringUtil.isNullOrEmpty(picUrls)) {
String[] pics = picUrls.split(",");
if (pics != null) {
- listpic = new ArrayList<>();
for (int i = 0; i < pics.length; i++) {
String picLink = pics[i];
- if (fileRequest != null) {
- MultipartFile file = fileRequest.getFile("file" + i);
- if (file != null) {
- picLink = uploadPicture(file);
- }
-
- }
if (picLink.startsWith("http")) {
+ listpic.add(picLink);
+ }
+ }
+ }
+ }
+
+ // 涓婁紶鏂囦欢鏇挎崲
+ if (fileRequest != null) {
+ for (int i = 0; i < 9; i++) {
+ MultipartFile file = fileRequest.getFile("file" + i);
+ if (file != null) {
+ String picLink = uploadPicture(file);
+ if (i < listpic.size()) {
+ listpic.set(i, picLink);
+ } else {
listpic.add(picLink);
}
}
@@ -468,8 +475,9 @@
}
/*
- * // 鏃犲埜涓嶈兘鑷姩 鐢熸垚璇勮 CouponInfoVO couponInfo1 = goodsDetailVO.getCouponInfo(); if
- * (couponInfo1 == null) { addComment = false; }
+ * // 鏃犲埜涓嶈兘鑷姩 鐢熸垚璇勮 CouponInfoVO couponInfo1 =
+ * goodsDetailVO.getCouponInfo(); if (couponInfo1 == null) { addComment
+ * = false; }
*/
String commentText = "";
@@ -488,23 +496,32 @@
String jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl,
JDApiUtil.POSITION_SHARE + "", "1");
String template = configService.get(ConfigKeyEnum.quickShareJDCommentText.getKey());
+ if (jumpLink == null) {
+ throw new GoodsEvaluateException(1, "璇ュ晢鍝佽浆閾惧け璐�");
+ }
commentText = template.replace("[閾炬帴]", jumpLink);
} else if (goodsType == Constant.SOURCE_TYPE_PDD) {
String jumpLink = PinDuoDuoApiUtil.getPromotionUrl(goodsId, PinDuoDuoApiUtil.PID_SHARE + "", "1");
+ if (jumpLink == null) {
+ throw new GoodsEvaluateException(1, "璇ュ晢鍝佽浆閾惧け璐�");
+ }
String template = configService.get(ConfigKeyEnum.quickSharePDDCommentText.getKey());
commentText = template.replace("[閾炬帴]", jumpLink);
}
-// commentText = commentText.replace("[鍘熶环]", MoneyBigDecimalUtil.getWithNoZera(goodsDetailVO.getZkPrice())+"");
-// if (!goodsDetailVO.isHasCoupon()) {
-// commentText = commentText.replace("棰嗗埜鎶㈣喘", "鎶㈣喘");
-// commentText = commentText.replace("銆愬埜鍚庝环銆慬鍒稿悗浠穄鍏�", "");
-// } else {
-// commentText = commentText.replace("[鍒稿悗浠穄", MoneyBigDecimalUtil.getWithNoZera(goodsDetailVO.getCouponPrice())+"");
-// }
-//
-// commentText = commentText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n").replace("\r\n\r\n",
-// "\r\n");
+ // commentText = commentText.replace("[鍘熶环]",
+ // MoneyBigDecimalUtil.getWithNoZera(goodsDetailVO.getZkPrice())+"");
+ // if (!goodsDetailVO.isHasCoupon()) {
+ // commentText = commentText.replace("棰嗗埜鎶㈣喘", "鎶㈣喘");
+ // commentText = commentText.replace("銆愬埜鍚庝环銆慬鍒稿悗浠穄鍏�", "");
+ // } else {
+ // commentText = commentText.replace("[鍒稿悗浠穄",
+ // MoneyBigDecimalUtil.getWithNoZera(goodsDetailVO.getCouponPrice())+"");
+ // }
+ //
+ // commentText = commentText.replace("\r\n\r\n",
+ // "\r\n").replace("\r\n\r\n", "\r\n").replace("\r\n\r\n",
+ // "\r\n");
CommentInfo commentInfo = new CommentInfo();
commentInfo.setId(UUID.randomUUID().toString().replace("-", ""));
@@ -513,6 +530,7 @@
commentsNew.add(commentInfo);
resultObj.setComments(commentsNew);
}
+ resultObj.setUpdateTime(new Date());
goodsEvaluateDao.save(resultObj);
// 鍒犻櫎鍥剧墖
@@ -681,7 +699,6 @@
}
String picUrl = goodsDetailVO.getPicUrl();
-
if (fileRequest != null) {
MultipartFile file = fileRequest.getFile("file" + i);
if (file != null) {
@@ -718,6 +735,8 @@
}
}
}
+
+
// 鏁版嵁瀵规瘮 鍒犻櫎鍥剧墖
if (oldGoodsList != null && oldGoodsList.size() > 0) {
@@ -845,6 +864,7 @@
}
resultObj.setComments(comments);
+ resultObj.setUpdateTime(new Date());
goodsEvaluateDao.save(resultObj);
}
@@ -935,17 +955,15 @@
throw new GoodsEvaluateException(1, "璇峰～鍐欏埜鎴鏃堕棿");
}
- if (!StringUtil.isNullOrEmpty(content) && kind != 3) { // 娲诲姩涓嶉獙璇�
- try {
- convertLinkManager.convertLinkFromText(content, Constant.LINK_TOKEN_VERIFY_UID, true);
- } catch (ConvertLinkExceptionException e) {
- if (ConvertLinkExceptionException.CODE_NONE != e.getCode()) {
- throw new GoodsEvaluateException(1, "鍖呭惈涓嶅彲杞摼鐨勫彛浠や笌閾炬帴");
- }
- } catch (Exception e) {
- throw new GoodsEvaluateException(1, "鍖呭惈涓嶅彲杞摼鐨勫彛浠や笌閾炬帴");
- }
- }
+ // 鍧囦笉楠岃瘉
+ /*
+ * if (!StringUtil.isNullOrEmpty(content) && kind != 3) { try {
+ * convertLinkManager.convertLinkFromText(content,
+ * Constant.LINK_TOKEN_VERIFY_UID, true); } catch (ConvertLinkExceptionException
+ * e) { if (ConvertLinkExceptionException.CODE_NONE != e.getCode()) { throw new
+ * GoodsEvaluateException(1, "鍖呭惈涓嶅彲杞摼鐨勫彛浠や笌閾炬帴"); } } catch (Exception e) { throw
+ * new GoodsEvaluateException(1, "鍖呭惈涓嶅彲杞摼鐨勫彛浠や笌閾炬帴"); } }
+ */
GoodsEvaluate resultObj = goodsEvaluateDao.getById(pid);
if (resultObj == null)
@@ -1240,49 +1258,52 @@
listImg.add(imgActivity);
}
- int totalImg = 0;
// 缂栬緫鍥剧墖
+ List<String> listpic = new ArrayList<>();
if (!StringUtil.isNullOrEmpty(picUrls)) {
String[] pics = picUrls.split(",");
if (pics != null) {
for (int i = 0; i < pics.length; i++) {
String picLink = pics[i];
- if (fileRequest != null) {
- MultipartFile file = fileRequest.getFile("file" + i);
- if (file != null) {
- picLink = uploadPicture(file);
-
- ImgInfo imgInfo0 = new ImgInfo();
- imgInfo0.setId(UUID.randomUUID().toString().replace("-", ""));
- imgInfo0.setLarge(false);
- imgInfo0.setPid(pid);
- imgInfo0.setUrl(picLink);
- imgInfo0.setUrlHD(picLink);
- imgInfo0.setType(ImgEnum.img);
- imgInfo0.setW(1);
- imgInfo0.setH(1);
- listImg.add(imgInfo0);
- totalImg++;
- continue;
- }
- }
-
if (picLink.startsWith("http")) {
- if (listOldImgInfo != null) {
- for (ImgInfo imgInfo : listOldImgInfo) {
- String url = imgInfo.getUrl();
- if (picLink.equals(url)) {
- listImg.add(imgInfo);
- totalImg++;
- break;
- }
- }
- }
+ listpic.add(picLink);
}
}
}
}
+ // 涓婁紶鏂囦欢鏇挎崲
+ if (fileRequest != null) {
+ for (int i = 0; i < 9; i++) {
+ MultipartFile file = fileRequest.getFile("file" + i);
+ if (file != null) {
+ String picLink = uploadPicture(file);
+ if (i < listpic.size()) {
+ listpic.set(i, picLink);
+ } else {
+ listpic.add(picLink);
+ }
+ }
+ }
+ }
+
+ int totalImg = 0;
+ for (String pic : listpic) {
+ ImgInfo imgInfo0 = new ImgInfo();
+ imgInfo0.setId(UUID.randomUUID().toString().replace("-", ""));
+ imgInfo0.setLarge(false);
+ imgInfo0.setPid(pid);
+ imgInfo0.setUrl(pic);
+ imgInfo0.setUrlHD(pic);
+ imgInfo0.setType(ImgEnum.img);
+ imgInfo0.setW(1);
+ imgInfo0.setH(1);
+ listImg.add(imgInfo0);
+ totalImg++;
+ }
+
+
+ // 娓呯悊鑰佸浘鐗�
if (listOld != null && listOld.size() > 0) {
for (int j = 0; j < listOld.size(); j++) {
boolean del = true;
@@ -1465,14 +1486,13 @@
return goodsEvaluateDao.count(key, state, dynamicType);
}
-
@Override
public void addRanDomShareCount() {
// 鍙戝湀
try {
List<GoodsEvaluate> list = goodsEvaluateDao.queryValid(0, Integer.MAX_VALUE, 1);
if (list != null) {
- for (GoodsEvaluate goodsEvaluate: list) {
+ for (GoodsEvaluate goodsEvaluate : list) {
Integer shareNum = goodsEvaluate.getShareNum();
if (shareNum == null) {
shareNum = 0;
@@ -1484,12 +1504,12 @@
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
-
+
// 绱犳潗
try {
List<GoodsEvaluate> list = goodsEvaluateDao.queryValid(0, Integer.MAX_VALUE, 2);
if (list != null) {
- for (GoodsEvaluate goodsEvaluate: list) {
+ for (GoodsEvaluate goodsEvaluate : list) {
Integer shareNum = goodsEvaluate.getShareNum();
if (shareNum == null) {
shareNum = 0;
@@ -1502,8 +1522,7 @@
LogHelper.errorDetailInfo(e);
}
}
-
-
+
@Override
@Cacheable(value = "dynamicCache", key = "'queryValidEvaluateCache-'+#start")
public List<GoodsEvaluate> queryValidEvaluateCache(int start, int count) {
@@ -1513,7 +1532,11 @@
executor.execute(new Runnable() {
@Override
public void run() {
+ // 鏇存柊淇℃伅
updateGoodInfo(list);
+
+ // 鍒犻櫎宸茶繃鏈�
+ removeOverdue();
}
});
@@ -1537,7 +1560,6 @@
List<GoodsEvaluate> listNew = new ArrayList<>();
for (GoodsEvaluate goodsEvaluate : list) {
-
GoodsEvaluate evaluateNew = new GoodsEvaluate();
try {
PropertyUtils.copyProperties(evaluateNew, goodsEvaluate);
@@ -1545,13 +1567,21 @@
e.printStackTrace();
continue;
}
+
+ // 鎸夌収鍙戝竷鏄剧ず鏃堕棿娈佃捣濮嬫椂闂翠负鍑嗐��
+ goodsEvaluate.setPublishTime(goodsEvaluate.getStartTime());
+
- int comment = 0;
+ // 鎸夌収鍙戝竷鏄剧ず鏃堕棿娈佃捣濮嬫椂闂翠负鍑嗐��
+ goodsEvaluate.setPublishTime(goodsEvaluate.getStartTime());
+
List<CommentInfo> comments = evaluateNew.getComments();
if (comments != null && comments.size() > 0) {
EvaluateEnum typeEnum = evaluateNew.getType();
List<CommentInfo> commentNew = new ArrayList<>();
+ boolean singleCoupn = true;
+ boolean currencyCoupon = true;
for (CommentInfo commentInfo : comments) {
if (StringUtil.isNullOrEmpty(commentInfo.getContent())
&& StringUtil.isNullOrEmpty(commentInfo.getCoupon())) {
@@ -1571,21 +1601,35 @@
if (goods != null) {
String content = commentInfoNew.getContent();
if (!StringUtil.isNullOrEmpty(content)) {
- content = content.replace("[鍘熶环]", MoneyBigDecimalUtil.getWithNoZera(goods.getZkPrice())+"");
+ content = content.replace("[鍘熶环]",
+ MoneyBigDecimalUtil.getWithNoZera(goods.getZkPrice()) + "");
if (goods.isHasCoupon()) {
- content = content.replace("[鍒稿悗浠穄",MoneyBigDecimalUtil.getWithNoZera(goods.getCouponPrice())+"");
+ content = content.replace("[鍒稿悗浠穄",
+ MoneyBigDecimalUtil.getWithNoZera(goods.getCouponPrice()) + "");
} else {
+ singleCoupn = false;
content = content.replace("棰嗗埜鎶㈣喘", "鎶㈣喘");
content = content.replace("銆愬埜鍚庝环銆慬鍒稿悗浠穄鍏�", "");
}
content = content.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n");
+ // 鏇挎崲娣樺疂瀹樻柟娲诲姩
+ List<String> activityIdList = convertLinkManager.getTaoBaoOfficialActivityId(content);
+ for (String st : activityIdList)
+ content = content.replace(st, "");
+
commentInfoNew.setContent(content);
}
}
}
-
-
- comment++;
+ if (typeEnum != null && typeEnum == EvaluateEnum.activity) {
+ // 鏇挎崲娣樺疂瀹樻柟娲诲姩
+ String content = commentInfoNew.getContent();
+ List<String> activityIdList = convertLinkManager.getTaoBaoOfficialActivityId(content);
+ for (String st : activityIdList)
+ content = content.replace(st, "");
+ commentInfoNew.setContent(content);
+ }
+
CommentInfoEnum typeComment = commentInfoNew.getTypeEnum();
if (typeComment != null && typeComment == CommentInfoEnum.goodsCoupon) {
GoodsDetailVO goods = evaluateNew.getGoods();
@@ -1616,9 +1660,11 @@
commentNew.add(commentInfoNew);
continue;
} else {
+ currencyCoupon = false;
continue;
}
} else {
+ currencyCoupon = false;
continue;
}
}
@@ -1628,11 +1674,11 @@
evaluateNew.setComments(commentNew);
if (typeEnum != null && typeEnum == EvaluateEnum.single) {
- if (comment > 0 && commentNew.size() == 0) { // 鎵�鏈夊埜璇勮涓嬫灦
+ if (!currencyCoupon && !singleCoupn) { // 鎵�鏈夊埜璇勮涓嬫灦
GoodsDetailVO goods = evaluateNew.getGoods();
if (goods != null) {
goods.setState(1); // 璇勮涓嶅瓨鍦� 涓嬫灦
- LogHelper.test("鑾峰彇鍒楄〃鍟嗗搧涓嬫灦1");
+ evaluateNew.setRemarks("璇勮楠岃瘉涓嬫灦");
}
List<ImgInfo> imgList = evaluateNew.getImgList();
@@ -1641,7 +1687,7 @@
SimpleGoods simpleGoods = imgInfo.getGoods();
if (simpleGoods != null) {
simpleGoods.setState(1);
- LogHelper.test("鑾峰彇鍒楄〃鍟嗗搧涓嬫灦2");
+ simpleGoods.setRemarks("璇勮楠岃瘉涓嬫灦");
}
}
@@ -1659,6 +1705,9 @@
@Override
public void run() {
updateGoodInfo(listOBJ);
+
+ // 鍒犻櫎宸茶繃鏈�
+ removeOverdue();
}
});
@@ -1727,6 +1776,7 @@
if (goodsNew != null) {
goodsEvaluate.setGoods(goodsNew);
} else {
+ goodsEvaluate.setRemarks("鏇存柊-浣嶇疆鎵惧埌鍟嗗搧淇℃伅");
goodsEvaluate.setState(0); // 宸插晢鍝佷笅鏋�
goods.setState(1);
goodsEvaluate.setGoods(goods);
@@ -1759,6 +1809,7 @@
imgInfo.setGoods(simpleGoods);
imgInfo.setGoodsVO(goodsDetailVO);
} else {
+ simpleGoods.setRemarks("鏇存柊-浣嶇疆鎵惧埌鍟嗗搧淇℃伅");
simpleGoods.setState(1);
imgInfo.setGoods(simpleGoods);
GoodsDetailVO goodsVO = imgInfo.getGoodsVO();
@@ -1869,7 +1920,9 @@
TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(1L, goodsVO.getGoodsId(), "0");
-// TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(Constant.LINK_TOKEN_VERIFY_UID, goodsVO.getGoodsId(), null);
+ // TaoBaoLink taoBaoLink =
+ // shareGoodsService.getTaoBaoLinkForShare(Constant.LINK_TOKEN_VERIFY_UID,
+ // goodsVO.getGoodsId(), null);
String template = configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey());
String commentText = template.replace("[娣樺彛浠", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));
@@ -2062,12 +2115,14 @@
String template = configService.get(ConfigKeyEnum.quickShareTBCommentText.getKey());
String commentText = template.replace("[娣樺彛浠", TaoBaoUtil.filterTaoToken(token));
- commentText = commentText.replace("[鍘熶环]", MoneyBigDecimalUtil.getWithNoZera(goodsVO.getZkPrice())+"");
+ commentText = commentText.replace("[鍘熶环]",
+ MoneyBigDecimalUtil.getWithNoZera(goodsVO.getZkPrice()) + "");
if (!goodsVO.isHasCoupon()) {
commentText = commentText.replace("棰嗗埜鎶㈣喘", "鎶㈣喘");
commentText = commentText.replace("銆愬埜鍚庝环銆慬鍒稿悗浠穄鍏�", "");
} else {
- commentText = commentText.replace("[鍒稿悗浠穄", MoneyBigDecimalUtil.getWithNoZera(goodsVO.getCouponPrice())+"");
+ commentText = commentText.replace("[鍒稿悗浠穄",
+ MoneyBigDecimalUtil.getWithNoZera(goodsVO.getCouponPrice()) + "");
}
commentText = commentText.replace("\r\n\r\n", "\r\n").replace("\r\n\r\n", "\r\n")
.replace("\r\n\r\n", "\r\n");
@@ -2088,27 +2143,26 @@
if (!StringUtil.isNullOrEmpty(evaluateText)) {
text2 += evaluateText;
}
-
+
String dtitle = daTaoKe.getDtitle();
if (!StringUtil.isNullOrEmpty(dtitle)) {
- text2 = text2 + dtitle +"\n";
+ text2 = text2 + dtitle + "\n";
} else if (!StringUtil.isNullOrEmpty(evaluateText)) {
text2 += "\n";
}
- text2 += "鍏堥銆�"+ couponAmount +"鍏冧紭鎯犲埜銆戜笅鍗�";
-
+ text2 += "鍏堥銆�" + couponAmount + "鍏冧紭鎯犲埜銆戜笅鍗�";
+
CommentInfo commentInfo2 = new CommentInfo();
commentInfo2.setId(UUID.randomUUID().toString().replace("-", ""));
commentInfo2.setContent(text2);
commentInfo2.setTypeEnum(CommentInfoEnum.goodsCoupon);
commentInfo2.setType("");
-
-
+
List<CommentInfo> commentsNew = new ArrayList<>();
commentsNew.add(commentInfo);
commentsNew.add(commentInfo2);
goodsEvaluate.setComments(commentsNew);
-
+
goodsEvaluate.setGoods(goodsVO);
}
imgList.add(imgInfo);
@@ -2218,28 +2272,29 @@
}
return true;
}
-
+
@Override
public void updateTaoBaoGoods(TaoBaoGoodsBrief goods) {
try {
if (goods == null) {
return;
}
- List<GoodsEvaluate> queryExist = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_TAOBAO, goods.getAuctionId());
+ List<GoodsEvaluate> queryExist = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_TAOBAO,
+ goods.getAuctionId());
if (queryExist == null || queryExist.size() == 0) {
return;
}
-
+
ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate("android", "55");
paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);
updateGoods(queryExist, goodsNew);
-
+
} catch (Exception e) {
e.printStackTrace();
}
}
-
+
@Override
public void updateJDGoods(JDGoods jdGoods) {
if (jdGoods == null) {
@@ -2249,14 +2304,14 @@
if (queryExist == null || queryExist.size() == 0) {
return;
}
-
+
ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate("android", "55");
paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertJDGoods(jdGoods, paramsDTO);
-
+
updateGoods(queryExist, goodsNew);
}
-
+
@Override
public void updatePDDGoods(PDDGoodsDetail pddGoods) {
if (pddGoods == null) {
@@ -2266,28 +2321,23 @@
if (queryExist == null || queryExist.size() == 0) {
return;
}
-
+
ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate("android", "55");
paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertPDDGoods(pddGoods, paramsDTO);
updateGoods(queryExist, goodsNew);
}
-
+
private void updateGoods(List<GoodsEvaluate> listExist, GoodsDetailVO goodsNew) {
long goodsId = goodsNew.getGoodsId();
int goodsType = goodsNew.getGoodsType();
- for (GoodsEvaluate goodsEvaluate: listExist) {
+ for (GoodsEvaluate goodsEvaluate : listExist) {
GoodsDetailVO goodsDetailVO = goodsEvaluate.getGoods();
- if (goodsDetailVO != null && goodsDetailVO.getGoodsId() != null
- && goodsDetailVO.getGoodsId() == goodsId && goodsDetailVO.getGoodsType() == goodsType ) {
- if (goodsDetailVO.getTitle().equalsIgnoreCase(goodsNew.getTitle())) {
- goodsEvaluate.setGoods(goodsNew);
- } else {
- goodsEvaluate.setState(1);
- goodsEvaluate.setRemarks("鍟嗗搧鏍囬鍙戠敓鍙樺寲涓嬫灦锛�" + goodsDetailVO.getTitle() +" / 鏂帮細" + goodsNew.getTitle());
- }
+ if (goodsDetailVO != null && goodsDetailVO.getGoodsId() != null && goodsDetailVO.getGoodsId() == goodsId
+ && goodsDetailVO.getGoodsType() == goodsType) {
+ goodsEvaluate.setGoods(goodsNew);
}
-
+
// 鏇存柊鍟嗗搧淇℃伅
List<ImgInfo> imgList = goodsEvaluate.getImgList();
if (imgList == null || imgList.size() == 0) {
@@ -2296,38 +2346,49 @@
for (ImgInfo imgInfo : imgList) {
SimpleGoods simpleGoods = imgInfo.getGoods();
- if (simpleGoods == null || simpleGoods.getGoodsId() != goodsId
+ if (simpleGoods == null || simpleGoods.getGoodsId() != goodsId
|| goodsType != simpleGoods.getGoodsType()) {
continue;
}
- GoodsDetailVO goodsVO = imgInfo.getGoodsVO();
- if (goodsVO != null) {
- if (goodsVO.getTitle().equalsIgnoreCase(goodsNew.getTitle())) {
- simpleGoods.setState(0);
- } else {
- simpleGoods.setState(1);
- simpleGoods.setRemarks("鍟嗗搧鏍囬鍙戠敓鍙樺寲涓嬫灦锛�" + goodsVO.getTitle() +" / 鏂帮細" + goodsNew.getTitle());
- }
- }
-
- simpleGoods.setPrice(goodsDetailVO.getCouponPrice());
- CouponInfoVO couponInfo = goodsDetailVO.getCouponInfo();
+ simpleGoods.setState(0);
+ simpleGoods.setPrice(goodsNew.getCouponPrice());
+ CouponInfoVO couponInfo = goodsNew.getCouponInfo();
if (couponInfo == null) {
- simpleGoods.setPrice(goodsDetailVO.getZkPrice());
+ simpleGoods.setPrice(goodsNew.getZkPrice());
} else {
- simpleGoods.setPrice(goodsDetailVO.getCouponPrice());
+ simpleGoods.setPrice(goodsNew.getCouponPrice());
simpleGoods.setAmount(couponInfo.getAmount());
}
+
imgInfo.setGoods(simpleGoods);
- imgInfo.setGoodsVO(goodsDetailVO);
+ imgInfo.setGoodsVO(goodsNew);
}
-
+
goodsEvaluate.setImgList(imgList);
goodsEvaluate.setUpdateTime(new Date());
goodsEvaluateDao.save(goodsEvaluate);
}
}
-
-
+
+ private void removeOverdue() {
+ List<GoodsEvaluate> list = goodsEvaluateDao.queryOverdue();
+ if (list == null || list.size() == 0) {
+ return;
+ }
+ long nm = 1000 * 60;// 涓�鍒嗛挓鐨勬绉掓暟
+ long nh = 1000 * 60 * 60;// 涓�灏忔椂鐨勬绉掓暟
+ long nd = 1000 * 24 * 60 * 60;// 涓�澶╃殑姣鏁�
+
+ long time = java.lang.System.currentTimeMillis();
+ for (GoodsEvaluate goodsEvaluate : list) {
+ long diff = time - goodsEvaluate.getEndTime().getTime();
+ long min = diff % nd % nh / nm;
+
+ // 杩囨湡瓒呰繃10鍒嗛挓灏卞垹闄�
+ if (min > 10) {
+ goodsEvaluateDao.remove(goodsEvaluate);
+ }
+ }
+ }
}
--
Gitblit v1.8.0