From 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 08 四月 2019 15:15:09 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java
index 58f301b..2395677 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java
@@ -11,7 +11,9 @@
import org.springframework.transaction.annotation.Transactional;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoOrderMapper;
+import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoOrderTradeMapMapper;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
+import com.yeshi.fanli.entity.taobao.TaoBaoOrderTradeMap;
import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
@@ -26,6 +28,9 @@
@Resource
private RedisManager redisManager;
+
+ @Resource
+ private TaoBaoOrderTradeMapMapper taoBaoOrderTradeMapMapper;
@Override
public void addTaoBaoOrderList(List<TaoBaoOrder> list) {
@@ -47,7 +52,7 @@
} catch (Exception e) {
}
-
+
addTaoBaoOrder(orderId, map.get(orderId));
try {
// 6灏忔椂鍐呬笉鍐嶅鐞�
@@ -56,8 +61,20 @@
} catch (Exception e) {
}
-
}
+ }
+
+ @Transactional
+ private void addTaoBaoOrderTradeMap(TaoBaoOrder order) {
+ if (order == null || StringUtil.isNullOrEmpty(order.getTradeId()))
+ return;
+ TaoBaoOrderTradeMap map = new TaoBaoOrderTradeMap();
+ map.setCreateTime(new Date());
+ map.setTaoBaoOrder(order);
+ map.setTradeId(order.getTradeId());
+ TaoBaoOrderTradeMap oldMap = taoBaoOrderTradeMapMapper.selectByTradeId(order.getTradeId());
+ if (oldMap == null)
+ taoBaoOrderTradeMapMapper.insertSelective(map);
}
@Transactional
@@ -68,6 +85,7 @@
for (TaoBaoOrder taoBaoOrder : list) {
taoBaoOrder.setLatestUpdateTime(new Date());
taoBaoOrderMapper.insertSelective(taoBaoOrder);
+ addTaoBaoOrderTradeMap(taoBaoOrder);
}
} else {
if (StringUtil.isNullOrEmpty(oldOrderList.get(0).getTradeId())) {
@@ -75,6 +93,7 @@
for (TaoBaoOrder taoBaoOrder : list) {
taoBaoOrder.setLatestUpdateTime(new Date());
taoBaoOrderMapper.insertSelective(taoBaoOrder);
+ addTaoBaoOrderTradeMap(taoBaoOrder);
}
} else {
// 鎸塼radeId鏇存柊
@@ -83,12 +102,16 @@
if (order == null) {
taoBaoOrder.setLatestUpdateTime(new Date());
taoBaoOrderMapper.insertSelective(taoBaoOrder);
+ addTaoBaoOrderTradeMap(taoBaoOrder);
} else {
taoBaoOrder.setId(order.getId());
- taoBaoOrder.setRelationId(order.getRelationId());
- taoBaoOrder.setSpecialId(order.getSpecialId());
+ if (!StringUtil.isNullOrEmpty(order.getRelationId()))
+ taoBaoOrder.setRelationId(order.getRelationId());
+ if (!StringUtil.isNullOrEmpty(order.getSpecialId()))
+ taoBaoOrder.setSpecialId(order.getSpecialId());
taoBaoOrder.setLatestUpdateTime(new Date());
taoBaoOrderMapper.updateByPrimaryKeySelective(taoBaoOrder);
+ addTaoBaoOrderTradeMap(taoBaoOrder);
}
}
}
--
Gitblit v1.8.0