From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoShopServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoShopServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoShopServiceImpl.java
index 1a5c03a..1cc4323 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoShopServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoShopServiceImpl.java
@@ -35,7 +35,7 @@
@Resource
private TaoBaoShopMapper taoBaoShopMapper;
-
+
@Resource
private HongBaoManageService hongBaoManageService;
@@ -81,7 +81,7 @@
}
@Override
- public void changeInfo(MultipartFile file, Long id, String shopName) {
+ public void changeInfo(MultipartFile file, Long id, String shopName, String key) {
TaoBaoShop taoBaoShop = taoBaoShopMapper.selectByPrimaryKey(id);
if (taoBaoShop == null) {
return;
@@ -113,6 +113,7 @@
updateShop.setId(id);
updateShop.setShopNameCustom(shopName);
+ updateShop.setKey(key);
taoBaoShopMapper.updateByPrimaryKeySelective(updateShop);
}
@@ -153,12 +154,14 @@
if (shop != null)
return shop;
shop = TaoBaoUtil.getTaoBaoShopDetailByAuctionId(auctionId);
- if (shop != null)
- taoBaoShopMapper.insert(shop);
+ try {
+ if (shop != null)
+ taoBaoShopMapper.insert(shop);
+ } catch (Exception e) {
+ }
return shop;
}
-
@Override
@Cacheable(value = "brandCache", key = "'getShopByKey-'+#key")
public List<TaoBaoShopVO> getShopByKey(String key) {
--
Gitblit v1.8.0