From 4d7db6fd66f5b2c9cae9954e46314f9711ce1e8f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 十一月 2019 18:51:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 780ec09..1eafeef 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
@@ -80,6 +80,10 @@
if (StringUtil.isNullOrEmpty(name))
throw new BrandInfoException(1, "鍚嶇О涓嶈兘涓虹┖");
+ String shopKey = record.getShopKey();
+ if (StringUtil.isNullOrEmpty(shopKey))
+ record.setShopKey(name);
+
String searchKey = record.getSearchKey();
if (StringUtil.isNullOrEmpty(searchKey))
record.setSearchKey(name);
@@ -110,8 +114,8 @@
if (picture != null && picture.trim().length() > 0) {
// 鍒犻櫎鑰佸浘
- if (picture != null && picture.trim().length() > 0 && !Constant.IS_TEST) {
- COSManager.getInstance().deleteFile(picture);
+ if (resultObj.getIcon() != null && resultObj.getIcon().trim().length() > 0 && !Constant.IS_TEST) {
+ COSManager.getInstance().deleteFile(resultObj.getIcon());
};
// 瀛樺偍鏂板浘
record.setIcon(picture);
@@ -328,7 +332,7 @@
return brandInfoMapper.listValidByCidToApp(cid);
}
- @Cacheable(value = "brandCache", key = "'listValidToApp-'+#start+'-'+#start +'-'+#cid")
+// @Cacheable(value = "brandCache", key = "'listValidToApp-'+#start+'-'+#start +'-'+#cid")
@Override
public List<BrandInfoVO> listValidToApp(long start, int count, Long cid) {
List<BrandInfoVO> list = brandInfoMapper.listBrandInfoVO(start, count, cid);
--
Gitblit v1.8.0