From 3d3a9b46b56ded968b1803456470b5ec31e43ce7 Mon Sep 17 00:00:00 2001
From: 喻健 <喻健@Admin>
Date: 星期五, 30 十一月 2018 14:10:42 +0800
Subject: [PATCH] 调整推送内容以及队员返回字段
---
fanli/src/main/java/com/yeshi/fanli/util/HongBaoUtil.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 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 208bdef..363850f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/HongBaoUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/HongBaoUtil.java
@@ -156,11 +156,24 @@
TaoBaoOrder taoBaoOrder = validTaoBaoOrderList.get(i);
for (int n = 0; n < hongBaoList.size(); n++) {
HongBao hongBao = hongBaoList.get(n);
- if (taoBaoOrder.getAuctionId().longValue() == hongBao.getAuctionId()
- && taoBaoOrder.getPayment().compareTo(hongBao.getPayMoney()) == 0) {
- validHongBaoList.add(hongBao);
- hongBaoList.remove(n);
- break;
+
+ if (taoBaoOrder.getOrderState().equalsIgnoreCase("璁㈠崟缁撶畻")) {
+ if (taoBaoOrder.getAuctionId().longValue() == hongBao.getAuctionId()
+ &&( taoBaoOrder.getSettlement().compareTo(hongBao.getPayMoney()) == 0||taoBaoOrder.getPayment().compareTo(hongBao.getPayMoney()) == 0)) {
+ validHongBaoList.add(hongBao);
+ hongBaoList.remove(n);
+ break;
+ }
+ }
+
+ else {
+
+ if (taoBaoOrder.getAuctionId().longValue() == hongBao.getAuctionId()
+ && taoBaoOrder.getPayment().compareTo(hongBao.getPayMoney()) == 0) {
+ validHongBaoList.add(hongBao);
+ hongBaoList.remove(n);
+ break;
+ }
}
}
}
--
Gitblit v1.8.0