From e53459ac9bc0b5d94753c24f6928cfb57f2a8ba3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 03 八月 2019 18:17:50 +0800
Subject: [PATCH] 删除之前html残余代码
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 26 ++++++++------------------
1 files changed, 8 insertions(+), 18 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..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
@@ -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;
@@ -521,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()));
}
}
@@ -751,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));
@@ -806,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);
@@ -814,11 +808,7 @@
cog.setUpdateTime(new Date());
commonOrderGoodsMapper.insertSelective(cog);
} else {
- if (!Constant.IS_OUTNET) {
- JDGoods goods = JDApiUtil.getGoodsDetail(itemOrder.getSkuId());
- commonGoodsList.get(0).setTitle(goods.getSkuName());
- commonOrderGoodsMapper.updateByPrimaryKeySelective(commonGoodsList.get(0));
- }
+
}
newCommonOrder.setUserInfo(new UserInfo(uid));
commonOrderList.add(addCommonOrder(newCommonOrder));
--
Gitblit v1.8.0