fanli-server.git

			@@ -153,7 +153,7 @@

			}

			TaoBaoGoodsBrief goods = getTaoBaoGoods(Long.parseLong(goodsId));
			TaoBaoGoodsBrief goods = getTaoBaoGoods(goodsId);

			//加载资金信息
			com.yeshi.fanli.vo.goods.GoodsDetailVO goodsDetailVO1 = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);
			@@ -167,7 +167,7 @@
			GoodsDetailVOLijinFactory.fillRights(goodsDetailVO.getGoods());

			// 店铺信息
			TaoBaoShop shop = taoBaoShopService.getTaoBaoShop(goods.getId(), goods.getSellerId());
			TaoBaoShop shop = taoBaoShopService.getTaoBaoShop(goods.getAuctionId(), goods.getSellerId());
			if (shop != null) {
			String shopLink = shop.getShopLink();
			if (StringUtil.isNullOrEmpty(shopLink)) {
			@@ -274,13 +274,24 @@
			break;
			}

			userGoodsScanLogger.info("{}", new Gson().toJson(UserGoodsScanLog.UserGoodsScanLogFactory.create(goodsDetailVO.getGoods(), uid, acceptData.getUtdid(), acceptData.getDevice())));
			ThreadUtil.run(new Runnable() {


			@Override
			public void run() {
			try {
			userGoodsScanLogger.info("{}", new Gson().toJson(UserGoodsScanLog.UserGoodsScanLogFactory.create(goodsDetailVO.getGoods(), uid, acceptData.getUtdid(), acceptData.getDevice())));
			}catch(Exception e){

			}
			}
			});


			//是否收藏
			extraVO.setCollected(false);
			if (uid != null) {
			CollectionGoodsV2 collectionGoodsV2 = collectionGoodsV2Service.findByUidAndAuctionId(uid, goodsType == Constant.SOURCE_TYPE_SUNING ? goodsIdSuning : Long.parseLong(goodsDetailVO.getGoods().getGoodsId()), goodsType);
			CollectionGoodsV2 collectionGoodsV2 = collectionGoodsV2Service.findByUidAndAuctionId(uid, goodsType == Constant.SOURCE_TYPE_SUNING ? goodsIdSuning+"" : goodsDetailVO.getGoods().getGoodsId(), goodsType);
			if (collectionGoodsV2 != null) {
			extraVO.setCollected(true);
			}
			@@ -324,7 +335,7 @@


			try {
			LiJinExpendRecord record = goodsLijinMnager.createTBLijin(Long.parseLong(goodsId), uid, new Date(user.getCreatetime()));
			LiJinExpendRecord record = goodsLijinMnager.createTBLijin(goodsId, uid, new Date(user.getCreatetime()));
			String sendUrl = record.getSendUrl();
			if (StringUtil.isNullOrEmpty(sendUrl)) {
			out.print(JsonUtil.loadFalseResult("礼金创建失败"));
			@@ -381,7 +392,7 @@
			}


			private TaoBaoGoodsBrief getTaoBaoGoods(Long id) {
			private TaoBaoGoodsBrief getTaoBaoGoods(String id) {
			try {
			TaoBaoGoodsBrief goods = taoBaoGoodsCacheUtil.getCommonTaoBaoGoodsInfo(id);
			if (goods != null) {