admin
2020-05-06 24a8d17e007545f7426c48352109aa1a9c6587ee
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;
               }
            }
         }
      }