From e6764831a890de26fcfebb4fb8f3a22e9f8cc816 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 16:09:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 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 670f049..0181087 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
@@ -1,5 +1,8 @@
package com.yeshi.fanli.service.impl.taobao;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
@@ -35,6 +38,13 @@
@Resource
private TaoBaoOrderTradeMapMapper taoBaoOrderTradeMapMapper;
+ /**
+ * 鑾峰彇璁㈠崟鐨勫搱甯屽��
+ *
+ * @param list
+ * @return
+ */
+
@Override
public void addTaoBaoOrderList(List<TaoBaoOrder> list) {
if (list == null || list.size() == 0)
@@ -43,7 +53,7 @@
Iterator<String> its = map.keySet().iterator();
while (its.hasNext()) {
String orderId = its.next();
- String key = "addorder-" + orderId;
+ String key = "addorder-" + TaoBaoOrderUtil.getOrderDataHashCode(map.get(orderId));
// redis鍋氶鐜囬檺鍒�
try {
if (Constant.IS_OUTNET) {
@@ -173,4 +183,35 @@
}
}
+ @Override
+ public TaoBaoOrder selectByTradeId(String tradeId) {
+ return taoBaoOrderMapper.selectTaoBaoOrderByTradeId(tradeId);
+ }
+
+ @Override
+ public List<TaoBaoOrder> listAllOrder(int page, int pageSize) {
+ return taoBaoOrderMapper.listAllOrder(null, (page - 1) * pageSize, pageSize);
+ }
+
+ @Override
+ public long countAllOrder() {
+ return taoBaoOrderMapper.countAllOrder(null);
+ }
+
+ @Override
+ public TaoBaoOrder selectByPrimaryKey(Long id) {
+ return taoBaoOrderMapper.selectByPrimaryKey(id);
+ }
+
+ @Override
+ public List<TaoBaoOrder> listBySettlementTime(Long minTime, Long maxTime, int page, int pageSize) {
+
+ return taoBaoOrderMapper.listBySettlementTime(minTime, maxTime, (page - 1) * pageSize, pageSize);
+ }
+
+ @Override
+ public Long countBySettlementTime(Long minTime, Long maxTime) {
+ return taoBaoOrderMapper.countBySettlementTime(minTime, maxTime);
+ }
+
}
--
Gitblit v1.8.0