From 4d6d0dfe586077c44e70318d5500cf35b92b0d49 Mon Sep 17 00:00:00 2001 From: Administrator <Administrator@Admin> Date: 星期二, 04 十二月 2018 18:15:12 +0800 Subject: [PATCH] Merge branch 'dev1' --- fanli/src/main/java/com/yeshi/fanli/util/factory/CollectionGoodsFactory.java | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/CollectionGoodsFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/CollectionGoodsFactory.java index 1a01fca..6962c49 100644 --- a/fanli/src/main/java/com/yeshi/fanli/util/factory/CollectionGoodsFactory.java +++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/CollectionGoodsFactory.java @@ -1,12 +1,23 @@ package com.yeshi.fanli.util.factory; import com.yeshi.fanli.entity.bus.user.CollectionGoods; +import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; import com.yeshi.fanli.goods.CollectionGoodsV2; +import com.yeshi.fanli.goods.CommonGoods; +import com.yeshi.fanli.util.taobao.TaoBaoUtil; public class CollectionGoodsFactory { public static CollectionGoods create(CollectionGoodsV2 collectionGoods) { - return null; + if (collectionGoods == null) + return null; + CollectionGoods cg = null; + CommonGoods commnonGoods = collectionGoods.getCommonGoods(); + TaoBaoGoodsBrief taoBaoGoods = TaoBaoUtil.convert(commnonGoods); + cg = TaoBaoUtil.getCollectionGoods(taoBaoGoods, collectionGoods.getUserInfo()); + if (cg != null) + cg.setId(collectionGoods.getId()); + return cg; } } -- Gitblit v1.8.0