From f15acf7f2d57db3a32c574b0dfc21f564dca6024 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:01:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java | 119 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 76 insertions(+), 43 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 663d431..c2ec6b4 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;
@@ -329,21 +327,29 @@
}
// 缂栬緫鍥剧墖
- 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);
}
}
@@ -1250,47 +1256,48 @@
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) {
@@ -1523,7 +1530,11 @@
executor.execute(new Runnable() {
@Override
public void run() {
+ // 鏇存柊淇℃伅
updateGoodInfo(list);
+
+ // 鍒犻櫎宸茶繃鏈�
+ removeOverdue();
}
});
@@ -1670,6 +1681,9 @@
@Override
public void run() {
updateGoodInfo(listOBJ);
+
+ // 鍒犻櫎宸茶繃鏈�
+ removeOverdue();
}
});
@@ -2330,5 +2344,24 @@
}
}
-
+ 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