From 566f56c649205565f20bac598f29f81407b4b3d0 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 02 八月 2019 11:38:52 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 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 5df9321..f54cf4e 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
@@ -56,6 +56,7 @@
import com.yeshi.fanli.util.factory.CommonOrderGoodsFactory;
import com.yeshi.fanli.util.factory.goods.CommonOrderFactory;
import com.yeshi.fanli.util.jd.JDApiUtil;
+import com.yeshi.fanli.util.jd.JDUtil;
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
@@ -816,7 +817,10 @@
} 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));
}
}
--
Gitblit v1.8.0