From 0675aeeabdb2dad6d5f7ff0566dc8de6e0990763 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 03 一月 2019 17:33:39 +0800
Subject: [PATCH] 新版订单修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
index 9104c3f..f4dce2c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -13,6 +13,7 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import com.yeshi.fanli.dao.mybatis.AccountDetailsMapper;
@@ -173,11 +174,11 @@
list.get(0).getSourceMediaId(), list.get(0).getAdPositionId());
PidUser pidUser = pidUserMapper.selectByPid(pid);
if (pidUser != null && pidUser.getType() == PidUser.TYPE_SHARE_GOODS) {// 鍟嗗搧鍒嗕韩璁㈠崟
-// List<PidOrder> pidOrderList = new ArrayList<>();
-// for (TaoBaoOrder order : list) {
-// pidOrderList.add(TaoBaoOrderUtil.convertToPidOrder(order));
-// }
-// sharePidOrderMap.put(orderId, pidOrderList);
+ // List<PidOrder> pidOrderList = new ArrayList<>();
+ // for (TaoBaoOrder order : list) {
+ // pidOrderList.add(TaoBaoOrderUtil.convertToPidOrder(order));
+ // }
+ // sharePidOrderMap.put(orderId, pidOrderList);
shareOrderMap.put(orderId, list);
} else {// 鏅�氳繑鍒╄鍗�
fanliOrderMap.put(orderId, list);
@@ -226,16 +227,15 @@
return false;
}
- @Transactional
@Override
public void processShopingFanliOrder(Map<String, List<TaoBaoOrder>> orders) {
// 鏌ヨ鍦∣rder涓槸鍚﹀瓨鍦ㄨ璁㈠崟鍙�
Iterator<String> its = orders.keySet().iterator();
- String tempOrderId="";
+ String tempOrderId = "";
while (its.hasNext()) {
try {
String orderId = its.next();
- tempOrderId=orderId;
+ tempOrderId = orderId;
// 澶勭悊绾㈠寘涓庡瓙绾㈠寘
// if (isRedisLockOrder(orderId))
// continue;
@@ -841,7 +841,7 @@
@Resource
private HongBaoV2Service hongBaoV2Service;
- @Transactional
+ @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
@Override
public void processShopingFanliOrderNew(String orderId, List<TaoBaoOrder> orderList)
throws HongBaoException, OrderItemException {
--
Gitblit v1.8.0