From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java
index 3083fec..c4594b8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java
@@ -36,6 +36,7 @@
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.FilePathEnum;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.vo.brand.BrandInfoVO;
@@ -208,7 +209,7 @@
String type = contentType.substring(contentType.indexOf("/") + 1);
// 鏂囦欢璺緞
- String filePath = "/img/brand/" + UUID.randomUUID().toString().replace("-", "") + "." + type;
+ String filePath = FilePathEnum.brand.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type;
// 鎵ц涓婁紶
String fileLink = COSManager.getInstance().uploadFile(inputStream, filePath).getUrl();
@@ -370,12 +371,15 @@
@Override
public void addShopAndGoods(long start, int count) {
List<BrandInfo> list = brandInfoMapper.listValidAll(start, count);
+ addShopAndGoods(list);
+ }
+
+ @Override
+ public void addShopAndGoods(List<BrandInfo> list) {
if (list == null || list.size() == 0)
return;
- long startTime = java.lang.System.currentTimeMillis();
- LogHelper.test(start + "鍝佺墝鏇存柊service---addShopAndGoods" + startTime);
-
+ // long startTime = java.lang.System.currentTimeMillis();
for (BrandInfo brandInfo : list) {
try {
String name = brandInfo.getName();
@@ -396,9 +400,7 @@
LogHelper.errorDetailInfo(e);
}
}
-
- long endTime = java.lang.System.currentTimeMillis();
- LogHelper.test(start + "鍝佺墝鏇存柊service---addShopAndGoods" + endTime + ",鏈鎬昏�楁椂:" + (endTime - startTime) / 1000);
+ // long endTime = java.lang.System.currentTimeMillis();
}
@Override
@@ -469,7 +471,7 @@
@Override
@Cacheable(value = "brandCache", key = "'listByAlikeName-'+#key+'-'+#platform+'-'+#version")
- public BrandInfoVO listByAlikeName(String key,String platform,String version) {
+ public BrandInfoVO listByAlikeName(String key, String platform, String version) {
if (StringUtil.isNullOrEmpty(key))
return null;
@@ -477,8 +479,7 @@
if (list == null || list.size() == 0)
return null;
-
- ConfigParamsDTO configParamsDTO = hongBaoManageService.getShowComputeRate(platform, version);
+ ConfigParamsDTO configParamsDTO = hongBaoManageService.getShowComputeRate(platform, version);
BrandInfoVO brand = list.get(0);
List<BrandGoodsCahe> listGoods = brandGoodsCaheService.getByBrandId(1, 3, brand.getId());
@@ -512,4 +513,10 @@
brand.setListGoods(listGoodsVO);
return brand;
}
+
+ @Override
+ public List<BrandInfo> listValidOrderByUpdateTime(int page, int pageSize) {
+ return brandInfoMapper.listValidAll((page - 1) * pageSize, pageSize);
+ }
+
}
--
Gitblit v1.8.0