yujian
2019-07-18 3eb97e3efbc84ae920a7d1048357615a04308618
搜索结果店铺处理
4个文件已修改
64 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoShop.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoShopServiceImpl.java 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoShopService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
@@ -443,9 +443,9 @@
        if (page == 1) {
            // 第一页返回店铺信息
            List<TaoBaoShopVO> listShop = taoBaoShopService.getShopByKey(key);
            if (listShop != null && listShop.size() > 0 && listShop.get(0).getListGoods() != null
                    && listShop.get(0).getListGoods().size() > 2) {
            List<TaoBaoShopVO> listShop = taoBaoShopService.getShopByKeyV2(key);
            if (listShop != null && listShop.size() > 0 && listShop.get(0).getListGoodsVO() != null
                    && listShop.get(0).getListGoodsVO().size() > 2) {
                data.put("shop", JsonUtil.getApiCommonGson().toJson(listShop.get(0)));
            }
        }
fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoShop.java
@@ -68,9 +68,11 @@
    @Column(name = "tsi_score_goods_d")
    private BigDecimal scoreGoodsD;// 与行业平均分的差值
    
    @Expose
    @Column(name = "tsi_score_seller_d")
    private BigDecimal scoreSellerD;
    
    @Expose
    @Column(name = "tsi_score_logistics_d")
    private BigDecimal scoreLogisticsD;
    
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoShopServiceImpl.java
@@ -23,9 +23,11 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
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 {
@@ -197,4 +199,50 @@
        }
        return list;
    }
    @Override
    @Cacheable(value = "brandCache", key = "'getShopByKeyV2-'+#key")
    public List<TaoBaoShopVO> getShopByKeyV2(String key) {
        List<TaoBaoShopVO> list = taoBaoShopMapper.getShopByKey(key);
        if (list == null || list.size() == 0) {
            return null;
        }
        BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
        BigDecimal shareRate = hongBaoManageService.getShareRate();
        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, null, fanLiRate, shareRate);
                listGoods.add(goodsDetailVO);
            }
            taoBaoShopVO.setListGoodsVO(listGoods);
        }
        return list;
    }
}
fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoShopService.java
@@ -67,4 +67,12 @@
     * @return
     */
    public List<TaoBaoShopVO> getShopByKey(String key);
    /**
     * 根据店铺搜索关键词查找
     * @param key
     * @return
     */
    public List<TaoBaoShopVO> getShopByKeyV2(String key);
}