From efd965b02d6ca3c1506d027feb27c95a36a33ea0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 03 八月 2019 18:16:29 +0800
Subject: [PATCH] 智能推荐增加拼多多/京东链接

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java |   28 +++++++---------------------
 1 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index f54cf4e..8247182 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -522,9 +522,9 @@
 			}
 
 			// 鍒嗕韩銆侀個璇� 闅愯棌璁㈠崟鍙�
-			if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType || HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
-					|| HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
-					|| HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
+			if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType || HongBaoV2.TYPE_YAOQING == hongBaoType
+					|| HongBaoV2.TYPE_YIJI == hongBaoType || HongBaoV2.TYPE_ERJI == hongBaoType
+					|| HongBaoV2.TYPE_SHARE_YIJI == hongBaoType || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
 				order.setOrderNo(UserUtil.filterOrderId(order.getOrderNo()));
 			}
 		}
@@ -752,16 +752,6 @@
 				commonOrderGoodsMapper.insertSelective(cog);
 				newCommonOrder.setCommonOrderGoods(cog);
 			} else {
-				if (!Constant.IS_OUTNET) {
-					PDDGoodsDetail pddGoods = null;
-					pddGoods = PinDuoDuoApiUtil.getGoodsDetail(Long.parseLong(cog.getGoodsId()));
-					if (pddGoods != null) {
-						cog = CommonOrderGoodsFactory.create(pddGoods);
-						commonGoodsList.get(0).setPicture(cog.getPicture());
-						commonOrderGoodsMapper.updateByPrimaryKeySelective(commonGoodsList.get(0));
-					}
-				}
-
 			}
 			newCommonOrder.setUserInfo(new UserInfo(uid));
 			commonOrderList.add(addCommonOrder(newCommonOrder));
@@ -807,6 +797,9 @@
 			if (commonGoodsList.size() <= 0)// 涓嶅瓨鍦ㄥ氨鎻掑叆鍟嗗搧
 			{
 				JDGoods goods = JDApiUtil.getGoodsDetail(itemOrder.getSkuId());
+				if (goods == null) {
+					goods = JDUtil.getGoodsFromWeb(itemOrder.getSkuId());
+				}
 
 				if (goods != null) {
 					cog = CommonOrderGoodsFactory.create(goods);
@@ -815,14 +808,7 @@
 				cog.setUpdateTime(new Date());
 				commonOrderGoodsMapper.insertSelective(cog);
 			} else {
-				if (!Constant.IS_OUTNET) {
-					JDGoods goods = JDApiUtil.getGoodsDetail(itemOrder.getSkuId());
-					if(goods==null)
-						goods=JDUtil.getGoodsFromWeb(itemOrder.getSkuId());
-					commonGoodsList.get(0).setTitle(goods.getSkuName());
-					commonGoodsList.get(0).setPicture(goods.getPicUrl());
-					commonOrderGoodsMapper.updateByPrimaryKeySelective(commonGoodsList.get(0));
-				}
+
 			}
 			newCommonOrder.setUserInfo(new UserInfo(uid));
 			commonOrderList.add(addCommonOrder(newCommonOrder));

--
Gitblit v1.8.0