From 64a1ca289eda4deb422549311c4539b09fd30ba3 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 07 十一月 2019 12:31:36 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandShopCaheServiceImpl.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandShopCaheServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandShopCaheServiceImpl.java
index f8c3247..1d96481 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandShopCaheServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandShopCaheServiceImpl.java
@@ -38,13 +38,16 @@
* @return
*/
@Override
- public boolean addBrandShopTB(Long brandId, Long auctionId, Long sellerId) {
+ public boolean addBrandShopTB(BrandInfo brandInfo, Long auctionId, Long sellerId) {
TaoBaoShop taoBaoShop = taoBaoShopService.getTaoBaoShop(auctionId, sellerId);
if (taoBaoShop == null)
return true;
+ ShopInfoVO shopInfoVO = ShopInfoVOFactory.convertTaoBaoShop(taoBaoShop);
+ shopInfoVO.setShopIcon(brandInfo.getIcon());
+
BrandShopCahe brandShop = new BrandShopCahe();
- brandShop.setBrandId(brandId);
+ brandShop.setBrandId(brandInfo.getId());
brandShop.setShop(ShopInfoVOFactory.convertTaoBaoShop(taoBaoShop));
brandShop.setCreateTime(new Date());
brandShopCaheDao.insert(brandShop);
@@ -62,11 +65,12 @@
public void addBrandShopJD(BrandInfo brandInfo, JDShopInfo shopInfo) {
ShopInfoVO shopInfoVO = ShopInfoVOFactory.convertJDShop(shopInfo);
shopInfoVO.setShopIcon(brandInfo.getIcon());
+
BrandShopCahe brandShop = new BrandShopCahe();
brandShop.setBrandId(brandInfo.getId());
brandShop.setShop(shopInfoVO);
brandShop.setCreateTime(new Date());
- brandShopCaheDao.save(brandShop);
+ brandShopCaheDao.insert(brandShop);
}
@@ -77,6 +81,10 @@
*/
@Override
public void addBrandShopPDD(BrandInfo brandInfo) {
+ String shopKey = brandInfo.getShopKey();
+ if (StringUtil.isNullOrEmpty(shopKey))
+ shopKey = brandInfo.getName();
+
String searchKey = brandInfo.getSearchKey();
if (StringUtil.isNullOrEmpty(searchKey))
searchKey = brandInfo.getName();
@@ -96,7 +104,7 @@
for (PDDGoodsDetail goods : goodsList) {
// 鍖呭惈搴楅摵id 銆佸寘鍚搧鐗屽悕绉�
String mallName = goods.getMallName();
- if(addShop && !StringUtil.isNullOrEmpty(mallName) && mallName.contains(brandInfo.getName())
+ if(addShop && !StringUtil.isNullOrEmpty(mallName) && mallName.toLowerCase().contains(shopKey.toLowerCase())
&& goods.getMallId() != null){
shopInfoVO = new ShopInfoVO();
shopInfoVO.setId(goods.getMallId().toString());
--
Gitblit v1.8.0