From 0ec22dcf4fd9c4496e6f681e7fab89f56c6e4e8a Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 02 四月 2020 14:45:20 +0800
Subject: [PATCH] vip 消息

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderRepairServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderRepairServiceImpl.java
index 5a904c5..7022998 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderRepairServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderRepairServiceImpl.java
@@ -69,7 +69,7 @@
 import com.yeshi.fanli.util.TimeUtil;
 import com.yeshi.fanli.util.factory.CommonOrderGoodsFactory;
 import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
-import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
+import com.yeshi.fanli.util.factory.goods.CommonOrderFactory;
 import com.yeshi.fanli.util.taobao.TaoBaoUtil;
 import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
 
@@ -147,7 +147,7 @@
 	@Resource
 	private ExtractCheckCompensateMapper extractCheckCompensateMapper;
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public void repairOrder(String orderId) throws Exception {
 		// 姣旇緝CommonOrder涓嶵aoBaoOrder鐨勯浼版敹鐩�
@@ -289,7 +289,7 @@
 			wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_BUFENYOUXIAO;
 
 		for (TaoBaoOrder taoBaoOrder : taoBaoOrderList) {
-			CommonOrder commonOrder = TaoBaoOrderUtil.convert(taoBaoOrder);
+			CommonOrder commonOrder = CommonOrderFactory.create(taoBaoOrder);
 			commonOrder.setStateWholeOrder(wholeOrderState);
 			commonOrder.setCommonOrderGoods(getCommonOrderGoods(taoBaoOrder.getAuctionId()));
 			commonOrder.setUserInfo(new UserInfo(mainUid));
@@ -391,10 +391,10 @@
 	}
 
 	// 淇敼璁㈠崟淇℃伅
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	private void updateOrderInfo(TaoBaoOrder taoBaoOrder, Long commonOrderId) throws Exception {
 		HongBaoOrder hongBaoOrder = hongBaoOrderService.selectDetailByCommonOrderId(commonOrderId);
-		CommonOrder newCommonOrder = TaoBaoOrderUtil.convert(taoBaoOrder);
+		CommonOrder newCommonOrder =  CommonOrderFactory.create(taoBaoOrder);
 		List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper
 				.listByGoodsIdAndGoodsType(taoBaoOrder.getAuctionId() + "", newCommonOrder.getSourceType());
 		CommonOrderGoods cog = null;
@@ -598,7 +598,7 @@
 		}
 	}
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	public void addOrder(CommonOrder commonOrder, int type, Long firstUid, Long secondUid) throws Exception {
 		// 澧炲姞commonOrder
 		commonOrder.setCreateTime(commonOrder.getThirdCreateTime());
@@ -960,7 +960,7 @@
 		return orderInfoMap.get(orderId);
 	}
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public void repireFirstAndSecondLevel(String orderId) throws Exception {
 		repireFirstShare(orderId);

--
Gitblit v1.8.0