From 60a099a7edfd81a3b10c766e113c019cdef6cd3d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 五月 2020 16:08:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 f7fde08..3246d69 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
@@ -265,7 +265,8 @@
ImgInfo info = new ImgInfo();
int width = sourceImg.getWidth();
int height = sourceImg.getHeight();
- String picLink = COSManager.getInstance().uploadFile(inputStream, filePath).getUrl();
+
+ String picLink = COSManager.getInstance().uploadFile(file.getInputStream(), filePath).getUrl();
info.setH(height);
info.setW(width);
@@ -1160,6 +1161,11 @@
} else {
lineNum = 3;
}
+ }
+
+ // 涓�寮犲浘鏄剧ず涓哄ぇ鍥�
+ if (tempList.size() == 1) {
+ tempList.get(0).setLarge(true);
}
if (tempList.size() > 0) {
@@ -2449,6 +2455,9 @@
* 鍒犻櫎宸茶繃鏈熸椂闂�
*/
private void removeOverdue() {
+ if(1>0)
+ return;
+
List<GoodsEvaluate> list = goodsEvaluateDao.queryOverdue();
if (list == null || list.size() == 0) {
return;
@@ -2473,6 +2482,8 @@
* 鍒犻櫎鍟嗗搧宸蹭笅鏋�-鍗曞搧
*/
private void removeDownGoods() {
+ if(1>0)
+ return;
try {
List<GoodsEvaluate> list = goodsEvaluateDao.removeDownGoods();
if (list == null || list.size() == 0) {
--
Gitblit v1.8.0