From 81da61b828e29b7745e1382dfbbaeb685dc083ef Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 23 一月 2024 17:17:55 +0800
Subject: [PATCH] 抖音转链修改
---
fanli/src/main/java/com/yeshi/fanli/util/HongBaoUtil.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/HongBaoUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/HongBaoUtil.java
index ffa315a..3c11e41 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/HongBaoUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/HongBaoUtil.java
@@ -7,6 +7,7 @@
import java.util.List;
import java.util.Map;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import org.yeshi.utils.JsonUtil;
import com.yeshi.fanli.dto.HongBao;
@@ -112,9 +113,8 @@
@Override
public int compare(OrderItem o1, OrderItem o2) {
- return o1.getAuctionId().longValue() == o2.getAuctionId() ? o1.getPayMoney().compareTo(o2.getPayMoney())
- : (int) ((o1.getAuctionId() - o2.getAuctionId())
- / Math.abs(o1.getAuctionId() - o2.getAuctionId()));
+ return TaoBaoUtil.isEqual( o1.getAuctionId(), o2.getAuctionId()) ? o1.getPayMoney().compareTo(o2.getPayMoney())
+ : o1.getAuctionId().compareTo (o2.getAuctionId());
}
};
@@ -122,9 +122,8 @@
@Override
public int compare(HongBao o1, HongBao o2) {
- return o1.getAuctionId().longValue() == o2.getAuctionId() ? o1.getPayMoney().compareTo(o2.getPayMoney())
- : (int) ((o1.getAuctionId() - o2.getAuctionId())
- / Math.abs(o1.getAuctionId() - o2.getAuctionId()));
+ return TaoBaoUtil.isEqual( o1.getAuctionId(), o2.getAuctionId()) ? o1.getPayMoney().compareTo(o2.getPayMoney())
+ : o1.getAuctionId().compareTo(o2.getAuctionId());
}
};
@@ -159,7 +158,7 @@
HongBao hongBao = hongBaoList.get(n);
if (taoBaoOrder.getOrderState().equalsIgnoreCase("璁㈠崟缁撶畻")) {
- if (taoBaoOrder.getAuctionId().longValue() == hongBao.getAuctionId()
+ if ( TaoBaoUtil.isEqual(taoBaoOrder.getAuctionId(), hongBao.getAuctionId()+"")
&&( taoBaoOrder.getSettlement().compareTo(hongBao.getPayMoney()) == 0||taoBaoOrder.getPayment().compareTo(hongBao.getPayMoney()) == 0)) {
validHongBaoList.add(hongBao);
hongBaoList.remove(n);
@@ -168,8 +167,7 @@
}
else {
-
- if (taoBaoOrder.getAuctionId().longValue() == hongBao.getAuctionId()
+ if (TaoBaoUtil.isEqual( taoBaoOrder.getAuctionId() ,hongBao.getAuctionId()+"")
&& taoBaoOrder.getPayment().compareTo(hongBao.getPayMoney()) == 0) {
validHongBaoList.add(hongBao);
hongBaoList.remove(n);
@@ -190,9 +188,8 @@
@Override
public int compare(TaoBaoOrder o1, TaoBaoOrder o2) {
- return o1.getAuctionId().longValue() == o2.getAuctionId() ? o1.getPayment().compareTo(o2.getPayment())
- : (int) ((o1.getAuctionId() - o2.getAuctionId())
- / Math.abs(o1.getAuctionId() - o2.getAuctionId()));
+ return TaoBaoUtil.isEqual(o1.getAuctionId(), o2.getAuctionId()) ? o1.getPayment().compareTo(o2.getPayment())
+ : o1.getAuctionId().compareTo( o2.getAuctionId());
}
};
@@ -200,9 +197,8 @@
@Override
public int compare(HongBao o1, HongBao o2) {
- return o1.getAuctionId().longValue() == o2.getAuctionId() ? o1.getPayMoney().compareTo(o2.getPayMoney())
- : (int) ((o1.getAuctionId() - o2.getAuctionId())
- / Math.abs(o1.getAuctionId() - o2.getAuctionId()));
+ return TaoBaoUtil.isEqual( o1.getAuctionId(), o2.getAuctionId()) ? o1.getPayMoney().compareTo(o2.getPayMoney())
+ : o1.getAuctionId().compareTo(o2.getAuctionId());
}
};
--
Gitblit v1.8.0