From 24a8d17e007545f7426c48352109aa1a9c6587ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 五月 2020 12:02:09 +0800
Subject: [PATCH] IOS上线隐藏我的界面的banner与超级会员升级信息
---
fanli/src/main/java/com/yeshi/fanli/util/HongBaoUtil.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 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..745e67a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/HongBaoUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/HongBaoUtil.java
@@ -7,14 +7,15 @@
import java.util.List;
import java.util.Map;
-import com.yeshi.fanli.entity.bus.user.HongBao;
+import org.yeshi.utils.JsonUtil;
+
+import com.yeshi.fanli.dto.HongBao;
+import com.yeshi.fanli.dto.order.OrderItem;
import com.yeshi.fanli.entity.bus.user.HongBaoExtra;
-import com.yeshi.fanli.entity.bus.user.OrderItem;
import com.yeshi.fanli.entity.taobao.OrderItemHongBao;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.entity.taobao.TaobaoOrderHongBao;
import com.yeshi.fanli.log.LogHelper;
-import org.yeshi.utils.JsonUtil;
public class HongBaoUtil {
@@ -156,11 +157,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