From 07c13064382007999e87abe81efe76c98a47dce8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 05 六月 2019 11:33:56 +0800
Subject: [PATCH] 修改部分bug

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 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 69bc0db..b2a1d45 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
@@ -22,6 +22,7 @@
 import com.yeshi.fanli.entity.bus.user.HongBaoV2;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.entity.bus.user.UserSystemCouponRecord;
+import com.yeshi.fanli.entity.goods.CommonGoods;
 import com.yeshi.fanli.entity.order.CommonOrder;
 import com.yeshi.fanli.entity.order.CommonOrderGoods;
 import com.yeshi.fanli.entity.order.CommonOrderTradeIdMap;
@@ -35,6 +36,7 @@
 import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.config.SystemCouponService;
+import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
 import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
 import com.yeshi.fanli.service.inter.order.CommonOrderService;
 import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
@@ -84,6 +86,9 @@
 
 	@Resource
 	private CommonOrderTradeIdMapMapper commonOrderTradeIdMapMapper;
+
+	@Resource
+	private CommonGoodsService commonGoodsService;
 
 	// 濂栧姳璁㈠崟鍥剧墖
 	public final static String PIC_REWARD = "http://img.flqapp.com/resource/order/order_state_reward.png";
@@ -603,8 +608,15 @@
 						taoBaoGoods = TaoKeApiUtil.getSimpleGoodsInfo(taoBaoOrder.getAuctionId());
 					} catch (TaobaoGoodsDownException e) {
 						e.printStackTrace();
-						LogHelper.errorDetailInfo(e, "AUCTIONID:"+taoBaoOrder.getAuctionId(), "");
-						taoBaoGoods = TaoBaoUtil.getSimpleGoodsBrief(taoBaoOrder.getAuctionId());
+						LogHelper.errorDetailInfo(e, "AUCTIONID:" + taoBaoOrder.getAuctionId(), "");
+						try {
+							taoBaoGoods = TaoBaoUtil.getSimpleGoodsBrief(taoBaoOrder.getAuctionId());
+						} catch (Exception e1) {
+							CommonGoods commonGoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(
+									taoBaoOrder.getAuctionId(), Constant.SOURCE_TYPE_TAOBAO);
+							if (commonGoods != null)
+								taoBaoGoods = TaoBaoUtil.convert(commonGoods);
+						}
 					}
 					if (taoBaoGoods != null) {
 						goods = CommonOrderGoodsFactory.create(taoBaoGoods);
@@ -621,8 +633,8 @@
 				commonOrderMapper.insertSelective(commonOrder);
 
 				// 鎻掑叆鏄犲皠锛屼繚璇佷氦鏄揑D鐨勫畬鏁存��
-				commonOrderTradeIdMapMapper.insertSelective(
-						new CommonOrderTradeIdMap(commonOrder.getId(), commonOrder.getTradeId(), new Date(),commonOrder.getSourceType()));
+				commonOrderTradeIdMapMapper.insertSelective(new CommonOrderTradeIdMap(commonOrder.getId(),
+						commonOrder.getTradeId(), new Date(), commonOrder.getSourceType()));
 
 				commonOrderList.add(commonOrder);
 				continue;

--
Gitblit v1.8.0