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 | 83 ++++++++++++++---------------------------
1 files changed, 29 insertions(+), 54 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 666a04a..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
@@ -7,20 +7,16 @@
import javax.annotation.Resource;
-import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;
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.bus.user.HongBaoV2;
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;
-import com.yeshi.fanli.vo.order.TaoBaoOrderVO;
@Service
public class TaoBaoOrderServiceImpl implements TaoBaoOrderService {
@@ -51,6 +47,7 @@
} catch (Exception e) {
}
+
addTaoBaoOrder(orderId, map.get(orderId));
try {
// 6灏忔椂鍐呬笉鍐嶅鐞�
@@ -73,18 +70,26 @@
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);
+ }
}
}
}
@@ -96,53 +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 {
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);
+ }
}
-
- @Override
- public List<TaoBaoOrderVO> listQuery(int start, int count, String key,
- String startTime, String endTime, Integer state) throws Exception {
-
- List<TaoBaoOrderVO> listData = taoBaoOrderMapper.listQuery(start, count, key, startTime, endTime, state);
-
- for (TaoBaoOrderVO taoBaoOrderVO : listData) {
-
- String orderState = taoBaoOrderVO.getOrderState();
- if ("璁㈠崟浠樻".equals(orderState)) {
- taoBaoOrderVO.setOrderState("1");
- }else if ("璁㈠崟缁撶畻".equals(orderState) || "璁㈠崟鎴愬姛".equals(orderState)) {
- taoBaoOrderVO.setOrderState("2");
- } else if ("璁㈠崟澶辨晥".equals(orderState)) {
- taoBaoOrderVO.setOrderState("3");
- }
- }
-
- return listData;
- }
-
- @Override
- public long countQuery(String key, String startTime, String endTime,
- Integer state) throws Exception {
- return taoBaoOrderMapper.countQuery(key, startTime, endTime, state);
- }
-
}
--
Gitblit v1.8.0