From 69bee82b81626b82b7f39f0e459e4f56b1699b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 12:02:16 +0800
Subject: [PATCH] 正式数据库修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java | 84 +++++++++++++++++++++++++++++-------------
1 files changed, 58 insertions(+), 26 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 8756443..58f301b 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,9 +11,11 @@
import org.springframework.transaction.annotation.Transactional;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoOrderMapper;
-import com.yeshi.fanli.entity.admin.ReslutOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
+import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.RedisManager;
+import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
@Service
@@ -21,6 +23,9 @@
@Resource
private TaoBaoOrderMapper taoBaoOrderMapper;
+
+ @Resource
+ private RedisManager redisManager;
@Override
public void addTaoBaoOrderList(List<TaoBaoOrder> list) {
@@ -30,7 +35,28 @@
Iterator<String> its = map.keySet().iterator();
while (its.hasNext()) {
String orderId = its.next();
+ String key = "addorder-" + orderId;
+ // redis鍋氶鐜囬檺鍒�
+ try {
+ if (Constant.IS_OUTNET) {
+ if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
+ continue;
+ }
+ }
+
+ } catch (Exception e) {
+
+ }
+
addTaoBaoOrder(orderId, map.get(orderId));
+ try {
+ // 6灏忔椂鍐呬笉鍐嶅鐞�
+ if (Constant.IS_OUTNET)
+ redisManager.cacheCommonString(key, "1", 60 * 60 * 6);
+ } catch (Exception e) {
+
+ }
+
}
}
@@ -44,23 +70,30 @@
taoBaoOrderMapper.insertSelective(taoBaoOrder);
}
} else {
- boolean hasPayOrder = false;
- for (TaoBaoOrder order : oldOrderList)
- if (order.getOrderState().equalsIgnoreCase("璁㈠崟浠樻")) {
- hasPayOrder = true;
- break;
- }
- // 鍒犻櫎鍘熸潵鐨勮鍗曪紝鍔犲叆鏂拌鍗�
- if (hasPayOrder) {
+ if (StringUtil.isNullOrEmpty(oldOrderList.get(0).getTradeId())) {
taoBaoOrderMapper.deleteByOrderId(orderId);
for (TaoBaoOrder taoBaoOrder : list) {
taoBaoOrder.setLatestUpdateTime(new Date());
taoBaoOrderMapper.insertSelective(taoBaoOrder);
}
+ } else {
+ // 鎸塼radeId鏇存柊
+ for (TaoBaoOrder taoBaoOrder : list) {
+ TaoBaoOrder order = taoBaoOrderMapper.selectTaoBaoOrderByTradeId(taoBaoOrder.getTradeId());
+ if (order == null) {
+ taoBaoOrder.setLatestUpdateTime(new Date());
+ taoBaoOrderMapper.insertSelective(taoBaoOrder);
+ } else {
+ taoBaoOrder.setId(order.getId());
+ taoBaoOrder.setRelationId(order.getRelationId());
+ taoBaoOrder.setSpecialId(order.getSpecialId());
+ taoBaoOrder.setLatestUpdateTime(new Date());
+ taoBaoOrderMapper.updateByPrimaryKeySelective(taoBaoOrder);
+ }
+ }
}
}
}
-
@Override
public List<TaoBaoOrder> getTaoBaoOrderByOrderId(String orderId) {
@@ -68,24 +101,23 @@
}
@Override
- public List<ReslutOrder> queryJoinHongBao (int start, int count, String key,
- String startTime,String endTime,Integer type,Integer days) throws Exception{
- return taoBaoOrderMapper.queryJoinHongBao(start, count, key, startTime, endTime, type, days);
- }
-
- @Override
- public int countQueryJoinHongBao(String key, String startTime,String endTime,Integer type,Integer days)throws Exception {
- return taoBaoOrderMapper.countQueryJoinHongBao(key, startTime, endTime, type, days);
- }
-
- @Override
- public double countEstimate(String date)throws Exception {
+ public double countEstimate(String date) throws Exception {
return taoBaoOrderMapper.countEstimate(date);
}
-
+
@Override
- public List<TaoBaoOrder> getStateByOrderIdAndPayment(String orderId, String payment )throws Exception {
- return taoBaoOrderMapper.getStateByOrderIdAndPayment(orderId, payment);
+ public void bindSpecialIdAndRealtionId(String tradeId, String specialId, String realtionId) {
+ if (StringUtil.isNullOrEmpty(specialId) && StringUtil.isNullOrEmpty(realtionId))
+ return;
+ TaoBaoOrder order = taoBaoOrderMapper.selectTaoBaoOrderByTradeId(tradeId);
+ if (order != null) {
+ TaoBaoOrder update = new TaoBaoOrder();
+ update.setId(order.getId());
+ update.setSpecialId(specialId);
+ update.setRelationId(realtionId);
+ update.setLatestUpdateTime(new Date());
+ taoBaoOrderMapper.updateByPrimaryKeySelective(update);
+ }
}
-
+
}
--
Gitblit v1.8.0