From 248aa38c12a393d12c5ab721ee75fbd5c7dfbb9f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 18 四月 2019 12:31:28 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 3aa3ebe..15b4f23 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
@@ -40,6 +40,7 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.factory.CommonOrderGoodsFactory;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import com.yeshi.fanli.vo.order.CommonOrderGoodsVO;
@@ -248,7 +249,7 @@
totalSettlement = commonOrder.getTotalPayment();
}
// 瀹炰粯娆�
- commonGoodsVO.setActualPay("瀹炰粯娆撅細楼" + totalSettlement);
+ commonGoodsVO.setActualPay("浠樻閲戦锛毬�" + totalSettlement);
listOrderGoods.add(commonGoodsVO);
@@ -595,6 +596,7 @@
taoBaoGoods = TaoKeApiUtil.getSimpleGoodsInfo(taoBaoOrder.getAuctionId());
} catch (TaobaoGoodsDownException e) {
e.printStackTrace();
+ taoBaoGoods=TaoBaoUtil.getSimpleGoodsBrief(taoBaoOrder.getAuctionId());
}
if (taoBaoGoods != null) {
goods = CommonOrderGoodsFactory.create(taoBaoGoods);
@@ -628,6 +630,7 @@
updateCommonOrder.setState(newCommonOrder.getState());
updateCommonOrder.setStateWholeOrder(wholeOrderState);
updateCommonOrder.setUpdateTime(new Date());
+ updateCommonOrder.setTradeId(newCommonOrder.getTradeId());
commonOrderMapper.updateByPrimaryKeySelective(updateCommonOrder);
commonOrderList.add(commonOrderMapper.selectByPrimaryKey(updateCommonOrder.getId()));
continue;
@@ -885,7 +888,7 @@
totalSettlement = commonOrder.getTotalPayment();
}
// 瀹炰粯娆�
- commonGoodsVO.setActualPay("瀹炰粯娆撅細楼" + totalSettlement);
+ commonGoodsVO.setActualPay("浠樻閲戦锛毬�" + totalSettlement);
listOrderGoods.add(commonGoodsVO);
--
Gitblit v1.8.0