From 24a8d17e007545f7426c48352109aa1a9c6587ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 五月 2020 12:02:09 +0800
Subject: [PATCH] IOS上线隐藏我的界面的banner与超级会员升级信息

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoShopServiceImpl.java |  164 ++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 144 insertions(+), 20 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 73957b9..60125f6 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
@@ -1,32 +1,52 @@
 package com.yeshi.fanli.service.impl.taobao;
 
 import java.io.InputStream;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.UUID;
 
 import javax.annotation.Resource;
 
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import org.yeshi.utils.tencentcloud.COSManager;
 
 import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoShopMapper;
+import com.yeshi.fanli.dto.ConfigParamsDTO;
+import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
 import com.yeshi.fanli.entity.taobao.TaoBaoShop;
 import com.yeshi.fanli.entity.taobao.TaoBaoShopInfo;
 import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
+import com.yeshi.fanli.util.FilePathEnum;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.db.MongoDBManager;
+import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
 import com.yeshi.fanli.util.taobao.TaoBaoShopUtil;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
+import com.yeshi.fanli.vo.brand.TaoBaoShopVO;
+import com.yeshi.fanli.vo.goods.GoodsDetailVO;
 
 @Service
 public class TaoBaoShopServiceImpl implements TaoBaoShopService {
 
 	@Resource
 	private MongoDBManager mongoDBManager;
-	
+
 	@Resource
 	private TaoBaoShopMapper taoBaoShopMapper;
+
+	@Resource
+	private HongBaoManageService hongBaoManageService;
+	
+	@Resource
+	private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
 
 	@Override
 	public TaoBaoShopInfo getTaoBaoShopInfo(TaoBaoGoodsBrief goodsInfo) {
@@ -53,32 +73,29 @@
 		LogHelper.test("鑾峰彇搴楅摵淇℃伅鑰楁椂:" + (System.currentTimeMillis() - startTime));
 		return shopInfo;
 	}
-	
-	
+
 	@Override
 	public TaoBaoShop selectByPrimaryKey(Long id) {
 		return taoBaoShopMapper.selectByPrimaryKey(id);
 	}
-
 
 	@Override
 	public int insertSelective(TaoBaoShop record) {
 		return taoBaoShopMapper.insertSelective(record);
 	}
 
-
 	@Override
 	public int updateByPrimaryKeySelective(TaoBaoShop record) {
 		return taoBaoShopMapper.updateByPrimaryKeySelective(record);
 	}
-	
+
 	@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;
 		}
-		
+
 		String fileLink = null;
 		if (file != null) {
 			try {
@@ -87,44 +104,151 @@
 				e.printStackTrace();
 			}
 		}
-		
+
 		TaoBaoShop updateShop = new TaoBaoShop();
 		if (!StringUtil.isNullOrEmpty(fileLink)) {
 			updateShop.setShopIconCustom(fileLink);
-			
+
 			// 鍒犻櫎鍥剧墖
 			String shopIconCustom = taoBaoShop.getShopIconCustom();
 			if (!StringUtil.isNullOrEmpty(shopIconCustom)) {
 				COSManager.getInstance().deleteFile(shopIconCustom);
 			}
 		}
-		
+
+		if (StringUtil.isNullOrEmpty(shopName) || "null".equalsIgnoreCase(shopName)) {
+			shopName = null;
+		}
+
 		updateShop.setId(id);
-		updateShop.setShopName(shopName);
+		updateShop.setShopNameCustom(shopName);
+		updateShop.setKey(key);
 		taoBaoShopMapper.updateByPrimaryKeySelective(updateShop);
 	}
-	
-	
+
 	/**
 	 * 涓婁紶鍥剧墖
+	 * 
 	 * @param file
 	 * @return
 	 * @throws Exception
 	 */
 	public String uploadPicture(MultipartFile file) throws Exception {
-		// 鏂囦欢瑙f瀽 
+		// 鏂囦欢瑙f瀽
 		InputStream inputStream = file.getInputStream();
 		String contentType = file.getContentType();
 		String type = contentType.substring(contentType.indexOf("/") + 1);
-	
+
 		// 鏂囦欢璺緞
-		String filePath="/img/TaoBaoShop/"+UUID.randomUUID().toString().replace("-", "") + "." + type;
+		String filePath = FilePathEnum.taoBaoShop.getPath()  + UUID.randomUUID().toString().replace("-", "") + "." + type;
 		// 鎵ц涓婁紶
-		String fileLink= COSManager.getInstance().uploadFile(inputStream, filePath).getUrl();
-		
+		String fileLink = COSManager.getInstance().uploadFile(inputStream, filePath).getUrl();
+
 		return fileLink;
 	}
 
-	
+	@Override
+	public List<TaoBaoShopVO> listBrandShopinfo(long start, int count, Long cid) {
+		return taoBaoShopMapper.listBrandShopinfo(start, count, cid);
+	}
 
+	@Override
+	public long countBrandShopinfo(Long cid) {
+		return taoBaoShopMapper.countBrandShopinfo(cid);
+	}
+
+	@Override
+	public TaoBaoShop getTaoBaoShop(Long auctionId, Long sellerId) {
+		TaoBaoShop shop = taoBaoShopMapper.selectByPrimaryKey(sellerId);
+		if (shop != null)
+			return shop;
+		shop = TaoBaoUtil.getTaoBaoShopDetailByAuctionId(auctionId);
+		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) {
+		List<TaoBaoShopVO> list = taoBaoShopMapper.getShopByKey(key);
+		if (list == null || list.size() == 0) {
+			return null;
+		}
+
+		BigDecimal proportion = hongBaoManageService.getFanLiRate(UserLevelEnum.daRen);
+		for (TaoBaoShopVO taoBaoShopVO : list) {
+
+			String shopLink = taoBaoShopVO.getShopLink();
+			if (StringUtil.isNullOrEmpty(shopLink)) {
+				taoBaoShopVO.setShopLink(TaoBaoUtil.getShopLink(taoBaoShopVO.getId()));
+			}
+
+			String shopNameCustom = taoBaoShopVO.getShopNameCustom();
+			if (!StringUtil.isNullOrEmpty(shopNameCustom)) {
+				taoBaoShopVO.setShopName(shopNameCustom);
+			}
+
+			String shopIconCustom = taoBaoShopVO.getShopIconCustom();
+			if (!StringUtil.isNullOrEmpty(shopIconCustom)) {
+				taoBaoShopVO.setShopIcon(shopIconCustom);
+			}
+
+			List<TaoBaoGoodsBriefExtra> listGoods = new ArrayList<TaoBaoGoodsBriefExtra>();
+			List<TaoBaoGoodsBrief> listGoodsBrief = taoBaoShopVO.getListGoodsBrief();
+			for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoodsBrief) {
+				listGoods.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null));
+			}
+			taoBaoShopVO.setListGoods(listGoods);
+		}
+		return list;
+	}
+
+	@Override
+	@Cacheable(value = "brandCache", key = "'getShopByKeyV2-'+#key+'-'+#platform+'-'+#version")
+	public List<TaoBaoShopVO> getShopByKeyV2(String key, String platform, String version) {
+		List<TaoBaoShopVO> list = taoBaoShopMapper.getShopByKey(key);
+		if (list == null || list.size() == 0) {
+			return null;
+		}
+
+		ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(platform, version,UserLevelEnum.daRen);
+
+		for (TaoBaoShopVO taoBaoShopVO : list) {
+
+			Integer userType = taoBaoShopVO.getUserType();
+			if (userType == null || userType == 0) {
+				taoBaoShopVO.setUserType(10);
+			} else {
+				taoBaoShopVO.setUserType(11);
+			}
+
+			String shopLink = taoBaoShopVO.getShopLink();
+			if (StringUtil.isNullOrEmpty(shopLink)) {
+				taoBaoShopVO.setShopLink(TaoBaoUtil.getShopLink(taoBaoShopVO.getId()));
+			}
+
+			String shopNameCustom = taoBaoShopVO.getShopNameCustom();
+			if (!StringUtil.isNullOrEmpty(shopNameCustom)) {
+				taoBaoShopVO.setShopName(shopNameCustom);
+			}
+
+			String shopIconCustom = taoBaoShopVO.getShopIconCustom();
+			if (!StringUtil.isNullOrEmpty(shopIconCustom)) {
+				taoBaoShopVO.setShopIcon(shopIconCustom);
+			}
+
+			List<GoodsDetailVO> listGoods = new ArrayList<GoodsDetailVO>();
+			List<TaoBaoGoodsBrief> listGoodsBrief = taoBaoShopVO.getListGoodsBrief();
+			for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoodsBrief) {
+				GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, paramsDTO);
+				listGoods.add(goodsDetailVO);
+			}
+			taoBaoShopVO.setListGoodsVO(listGoods);
+		}
+		return list;
+	}
 }

--
Gitblit v1.8.0