yujian
2019-01-22 88b54772dbcf5ecab1e2316e4e4626ac901b8908
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;
               }
            }
         }
      }