From 30d8e227e8d823b6c38c3b9c90ac2df03b63befe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 二月 2025 16:41:22 +0800
Subject: [PATCH] 淘宝转链接口更新

---
 fanli/src/main/java/com/yeshi/fanli/util/HongBaoUtil.java |  595 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 296 insertions(+), 299 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 363850f..3c11e41 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/HongBaoUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/HongBaoUtil.java
@@ -1,299 +1,296 @@
-package com.yeshi.fanli.util;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.yeshi.fanli.entity.bus.user.HongBao;
-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 {
-
-	private static final Map<Integer, String> titleMap = new HashMap<Integer, String>();
-	private static final Map<Integer, String> infoMap = new HashMap<Integer, String>();
-
-	static {
-		titleMap.put(1, "hongbao_type_1_title");
-		titleMap.put(2, "hongbao_type_2_title");
-		titleMap.put(3, "hongbao_type_3_title");
-		titleMap.put(4, "hongbao_type_4_title");
-		titleMap.put(5, "hongbao_type_5_title");
-		titleMap.put(6, "hongbao_type_6_title");
-		titleMap.put(7, "hongbao_type_7_title");
-		titleMap.put(20, "hongbao_type_20_title");
-		titleMap.put(21, "hongbao_type_21_title");
-		titleMap.put(22, "hongbao_type_22_title");
-
-		infoMap.put(1, "hongbao_type_1_info");
-		infoMap.put(2, "hongbao_type_2_info");
-		infoMap.put(3, "hongbao_type_3_info");
-		infoMap.put(4, "hongbao_type_4_info");
-		infoMap.put(5, "hongbao_type_5_info");
-		infoMap.put(6, "hongbao_type_6_info");
-		infoMap.put(7, "hongbao_type_7_info");
-		infoMap.put(20, "hongbao_type_20_info");
-		infoMap.put(21, "hongbao_type_21_info");
-		infoMap.put(22, "hongbao_type_22_info");
-	}
-
-	public static String getHongBaoTitle(int type) {
-		Map<String, String> map = PropertiesUtil.getMap();
-		String title = map.get(titleMap.get(type));
-		if (title == null) {
-			title = map.get(titleMap.get(Constant.HB_HUODONG));
-		}
-		return title;
-	}
-
-	public static String getHongBaoInfo(int type) {
-		Map<String, String> map = PropertiesUtil.getMap();
-		String info = map.get(infoMap.get(type));
-		if (info == null) {
-			info = map.get(infoMap.get(Constant.HB_HUODONG));
-		}
-		return info;
-	}
-
-	/**
-	 * 杞崲鎴愬寘瑁呯被
-	 * 
-	 * @param hongBao
-	 * @return
-	 */
-	public static HongBaoExtra convert(HongBao hongBao) {
-		HongBaoExtra hbx = new HongBaoExtra(hongBao);
-		String param = hongBao.getParam();
-		if (param != null) {
-			Map<String, String> map = JsonUtil.parseData(param);
-			if (map != null) {
-				String picture = map.get("picture");
-				if (picture != null) {
-					hbx.setPicture(picture);
-				} else {
-					hbx.setPicture("");
-				}
-			} else {
-				hbx.setPicture("");
-			}
-		}
-		hbx.setTitle(getHongBaoTitle(hongBao.getType()));
-		hbx.setInfo(getHongBaoInfo(hongBao.getType()));
-		return hbx;
-	}
-
-	public static String convertState(int state) {
-		if (state == 1 || state == 2) {
-			return "鏈埌璐�";
-		} else if (state == 3) {
-			return "宸插埌璐�";
-		} else if (state == 4) {
-			return "宸插け鏁�";
-		} else {
-			return "鐘舵�佷笉鐭�";
-		}
-	}
-
-	public static List<OrderItemHongBao> sortHongBaoAndOrderItem(List<OrderItem> orderItemList,
-			List<HongBao> hongBaoList) {
-		if (orderItemList.size() != hongBaoList.size())
-			return null;
-
-		Comparator<OrderItem> orderCM = new Comparator<OrderItem>() {
-
-			@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()));
-			}
-		};
-
-		Comparator<HongBao> hongBaoCM = new Comparator<HongBao>() {
-
-			@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()));
-			}
-		};
-
-		Collections.sort(orderItemList, orderCM);
-		Collections.sort(hongBaoList, hongBaoCM);
-
-		List<OrderItemHongBao> list = new ArrayList<>();
-		for (int i = 0; i < orderItemList.size(); i++) {
-			list.add(new OrderItemHongBao(hongBaoList.get(i), orderItemList.get(i)));
-		}
-		return list;
-	}
-
-	public static List<TaobaoOrderHongBao> sortHongBaoAndTaoBaoOrder(List<TaoBaoOrder> orderList,
-			List<HongBao> hongBaoList) {
-		if (orderList.size() != hongBaoList.size())
-			return null;
-		List<TaoBaoOrder> validTaoBaoOrderList = new ArrayList<>();
-		List<HongBao> validHongBaoList = new ArrayList<>();
-		for (int i = 0; i < orderList.size(); i++) {
-			TaoBaoOrder taoBaoOrder = orderList.get(i);
-			if (!taoBaoOrder.getOrderState().equalsIgnoreCase("璁㈠崟澶辨晥")) {
-				validTaoBaoOrderList.add(taoBaoOrder);
-				orderList.remove(i);
-				i--;
-			}
-		}
-
-		for (int i = 0; i < validTaoBaoOrderList.size(); i++) {
-			TaoBaoOrder taoBaoOrder = validTaoBaoOrderList.get(i);
-			for (int n = 0; n < hongBaoList.size(); n++) {
-				HongBao hongBao = hongBaoList.get(n);
-
-				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;
-					}
-				}
-			}
-		}
-
-		if (validTaoBaoOrderList.size() != validHongBaoList.size()) {
-			LogHelper.test("娣樺疂璁㈠崟涓庣孩鍖呮暟閲忎笉瀵瑰簲");
-			return null;
-		}
-
-		// 鍏堟帓搴忓皻鏈け鏁堢殑鍟嗗搧
-
-		Comparator<TaoBaoOrder> orderCM = new Comparator<TaoBaoOrder>() {
-
-			@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()));
-			}
-		};
-
-		Comparator<HongBao> hongBaoCM = new Comparator<HongBao>() {
-
-			@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()));
-			}
-		};
-
-		Collections.sort(validTaoBaoOrderList, orderCM);
-		Collections.sort(validHongBaoList, hongBaoCM);
-
-		// 鍔犲叆鍓╀笅鐨�
-
-		// orderCM = new Comparator<TaoBaoOrder>() {
-		//
-		// @Override
-		// public int compare(TaoBaoOrder o1, TaoBaoOrder o2) {
-		//
-		// if (o1.getAuctionId() - o2.getAuctionId() != 0)
-		// return (int) ((o1.getAuctionId() - o2.getAuctionId())
-		// / Math.abs(o1.getAuctionId() - o2.getAuctionId()));
-		// else
-		// o1.getAuctionId()
-		// }
-		// };
-		//
-		// hongBaoCM = new Comparator<HongBao>() {
-		// @Override
-		// public int compare(HongBao o1, HongBao o2) {
-		// return (int) ((o1.getAuctionId() - o2.getAuctionId())
-		// / Math.abs(o1.getAuctionId() - o2.getAuctionId()));
-		// }
-		// };
-
-		if (orderList.size() > 0) {
-			Collections.sort(orderList, orderCM);
-			validTaoBaoOrderList.addAll(orderList);
-		}
-
-		if (hongBaoList.size() > 0) {
-			Collections.sort(hongBaoList, hongBaoCM);
-			validHongBaoList.addAll(hongBaoList);
-		}
-		List<TaobaoOrderHongBao> list = new ArrayList<>();
-		for (int i = 0; i < validHongBaoList.size(); i++) {
-			list.add(new TaobaoOrderHongBao(validHongBaoList.get(i), validTaoBaoOrderList.get(i)));
-		}
-		return list;
-	}
-
-	public static List<OrderItem> convertToTiChengOrder(List<HongBao> hongBaoList) {
-		List<OrderItem> orderItemList = new ArrayList<>();
-		if (hongBaoList != null)
-			for (HongBao hb : hongBaoList) {
-				OrderItem orderItem = new OrderItem();
-				orderItem.setTitle("濂栭噾璁㈠崟鍟嗗搧");
-				if (hb.getParent() != null) {
-					orderItem.setPayMoney(hb.getParent().getPayMoney());
-					orderItem.setOrderId(hb.getParent().getOrderId());
-				} else {
-					orderItem.setPayMoney(hb.getPayMoney());
-					orderItem.setOrderId(hb.getOrderId());
-				}
-
-				if (!StringUtil.isNullOrEmpty(orderItem.getOrderId())) {
-					orderItem.setOrderId(
-							orderItem.getOrderId().substring(0, orderItem.getOrderId().length() - 6) + "******");
-				}
-
-				orderItem.setFanMoney(hb.getMoney());
-
-				if (hb.getState() == HongBao.STATE_BUKELINGQU || hb.getState() == HongBao.STATE_KELINGQU) {
-					orderItem.setDesc("璁㈠崟纭鏀惰揣鐨勬鏈�25鏃ュ悗鍒拌处");
-					orderItem.setStateDesc("鏈埌璐�");
-
-				} else if (hb.getState() == HongBao.STATE_YILINGQU) {
-
-					orderItem.setDesc("宸茶嚜鍔ㄨ浆鍏ヤ綘鐨勪綑棰�");
-					orderItem.setStateDesc("宸插埌璐�");
-
-				} else if (hb.getState() == HongBao.STATE_SHIXIAO) {
-					if (hb.getParent() != null && hb.getParent().getBalanceTime() != null) {
-						orderItem.setDesc("鍞悗璁㈠崟鏃犲閲�");
-						orderItem.setStateDesc("宸插敭鍚�");
-					} else {
-						orderItem.setDesc("閫�娆捐鍗曟棤濂栭噾");
-						orderItem.setStateDesc("宸查��娆�");
-					}
-				}
-
-				orderItem.setCreateTime(hb.getCreatetime());
-				orderItem.setState(hb.getState());
-				orderItem.setPicture(Constant.systemCommonConfig.getDefaultOrderPicture());
-
-				orderItemList.add(orderItem);
-			}
-		return orderItemList;
-	}
-
-}
+package com.yeshi.fanli.util;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+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;
+import com.yeshi.fanli.dto.order.OrderItem;
+import com.yeshi.fanli.entity.bus.user.HongBaoExtra;
+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;
+
+public class HongBaoUtil {
+
+	private static final Map<Integer, String> titleMap = new HashMap<Integer, String>();
+	private static final Map<Integer, String> infoMap = new HashMap<Integer, String>();
+
+	static {
+		titleMap.put(1, "hongbao_type_1_title");
+		titleMap.put(2, "hongbao_type_2_title");
+		titleMap.put(3, "hongbao_type_3_title");
+		titleMap.put(4, "hongbao_type_4_title");
+		titleMap.put(5, "hongbao_type_5_title");
+		titleMap.put(6, "hongbao_type_6_title");
+		titleMap.put(7, "hongbao_type_7_title");
+		titleMap.put(20, "hongbao_type_20_title");
+		titleMap.put(21, "hongbao_type_21_title");
+		titleMap.put(22, "hongbao_type_22_title");
+
+		infoMap.put(1, "hongbao_type_1_info");
+		infoMap.put(2, "hongbao_type_2_info");
+		infoMap.put(3, "hongbao_type_3_info");
+		infoMap.put(4, "hongbao_type_4_info");
+		infoMap.put(5, "hongbao_type_5_info");
+		infoMap.put(6, "hongbao_type_6_info");
+		infoMap.put(7, "hongbao_type_7_info");
+		infoMap.put(20, "hongbao_type_20_info");
+		infoMap.put(21, "hongbao_type_21_info");
+		infoMap.put(22, "hongbao_type_22_info");
+	}
+
+	public static String getHongBaoTitle(int type) {
+		Map<String, String> map = PropertiesUtil.getMap();
+		String title = map.get(titleMap.get(type));
+		if (title == null) {
+			title = map.get(titleMap.get(Constant.HB_HUODONG));
+		}
+		return title;
+	}
+
+	public static String getHongBaoInfo(int type) {
+		Map<String, String> map = PropertiesUtil.getMap();
+		String info = map.get(infoMap.get(type));
+		if (info == null) {
+			info = map.get(infoMap.get(Constant.HB_HUODONG));
+		}
+		return info;
+	}
+
+	/**
+	 * 杞崲鎴愬寘瑁呯被
+	 * 
+	 * @param hongBao
+	 * @return
+	 */
+	public static HongBaoExtra convert(HongBao hongBao) {
+		HongBaoExtra hbx = new HongBaoExtra(hongBao);
+		String param = hongBao.getParam();
+		if (param != null) {
+			Map<String, String> map = JsonUtil.parseData(param);
+			if (map != null) {
+				String picture = map.get("picture");
+				if (picture != null) {
+					hbx.setPicture(picture);
+				} else {
+					hbx.setPicture("");
+				}
+			} else {
+				hbx.setPicture("");
+			}
+		}
+		hbx.setTitle(getHongBaoTitle(hongBao.getType()));
+		hbx.setInfo(getHongBaoInfo(hongBao.getType()));
+		return hbx;
+	}
+
+	public static String convertState(int state) {
+		if (state == 1 || state == 2) {
+			return "鏈埌璐�";
+		} else if (state == 3) {
+			return "宸插埌璐�";
+		} else if (state == 4) {
+			return "宸插け鏁�";
+		} else {
+			return "鐘舵�佷笉鐭�";
+		}
+	}
+
+	public static List<OrderItemHongBao> sortHongBaoAndOrderItem(List<OrderItem> orderItemList,
+			List<HongBao> hongBaoList) {
+		if (orderItemList.size() != hongBaoList.size())
+			return null;
+
+		Comparator<OrderItem> orderCM = new Comparator<OrderItem>() {
+
+			@Override
+			public int compare(OrderItem o1, OrderItem o2) {
+				return TaoBaoUtil.isEqual( o1.getAuctionId(), o2.getAuctionId()) ? o1.getPayMoney().compareTo(o2.getPayMoney())
+						: o1.getAuctionId().compareTo (o2.getAuctionId());
+			}
+		};
+
+		Comparator<HongBao> hongBaoCM = new Comparator<HongBao>() {
+
+			@Override
+			public int compare(HongBao o1, HongBao o2) {
+				return TaoBaoUtil.isEqual( o1.getAuctionId(), o2.getAuctionId()) ? o1.getPayMoney().compareTo(o2.getPayMoney())
+						: o1.getAuctionId().compareTo(o2.getAuctionId());
+			}
+		};
+
+		Collections.sort(orderItemList, orderCM);
+		Collections.sort(hongBaoList, hongBaoCM);
+
+		List<OrderItemHongBao> list = new ArrayList<>();
+		for (int i = 0; i < orderItemList.size(); i++) {
+			list.add(new OrderItemHongBao(hongBaoList.get(i), orderItemList.get(i)));
+		}
+		return list;
+	}
+
+	public static List<TaobaoOrderHongBao> sortHongBaoAndTaoBaoOrder(List<TaoBaoOrder> orderList,
+			List<HongBao> hongBaoList) {
+		if (orderList.size() != hongBaoList.size())
+			return null;
+		List<TaoBaoOrder> validTaoBaoOrderList = new ArrayList<>();
+		List<HongBao> validHongBaoList = new ArrayList<>();
+		for (int i = 0; i < orderList.size(); i++) {
+			TaoBaoOrder taoBaoOrder = orderList.get(i);
+			if (!taoBaoOrder.getOrderState().equalsIgnoreCase("璁㈠崟澶辨晥")) {
+				validTaoBaoOrderList.add(taoBaoOrder);
+				orderList.remove(i);
+				i--;
+			}
+		}
+
+		for (int i = 0; i < validTaoBaoOrderList.size(); i++) {
+			TaoBaoOrder taoBaoOrder = validTaoBaoOrderList.get(i);
+			for (int n = 0; n < hongBaoList.size(); n++) {
+				HongBao hongBao = hongBaoList.get(n);
+
+				if (taoBaoOrder.getOrderState().equalsIgnoreCase("璁㈠崟缁撶畻")) {
+					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);
+						break;
+					}
+				}
+
+				else {
+					if (TaoBaoUtil.isEqual( taoBaoOrder.getAuctionId() ,hongBao.getAuctionId()+"")
+							&& taoBaoOrder.getPayment().compareTo(hongBao.getPayMoney()) == 0) {
+						validHongBaoList.add(hongBao);
+						hongBaoList.remove(n);
+						break;
+					}
+				}
+			}
+		}
+
+		if (validTaoBaoOrderList.size() != validHongBaoList.size()) {
+			LogHelper.test("娣樺疂璁㈠崟涓庣孩鍖呮暟閲忎笉瀵瑰簲");
+			return null;
+		}
+
+		// 鍏堟帓搴忓皻鏈け鏁堢殑鍟嗗搧
+
+		Comparator<TaoBaoOrder> orderCM = new Comparator<TaoBaoOrder>() {
+
+			@Override
+			public int compare(TaoBaoOrder o1, TaoBaoOrder o2) {
+				return TaoBaoUtil.isEqual(o1.getAuctionId(), o2.getAuctionId()) ? o1.getPayment().compareTo(o2.getPayment())
+						: o1.getAuctionId().compareTo( o2.getAuctionId());
+			}
+		};
+
+		Comparator<HongBao> hongBaoCM = new Comparator<HongBao>() {
+
+			@Override
+			public int compare(HongBao o1, HongBao o2) {
+				return TaoBaoUtil.isEqual( o1.getAuctionId(), o2.getAuctionId()) ? o1.getPayMoney().compareTo(o2.getPayMoney())
+						: o1.getAuctionId().compareTo(o2.getAuctionId());
+			}
+		};
+
+		Collections.sort(validTaoBaoOrderList, orderCM);
+		Collections.sort(validHongBaoList, hongBaoCM);
+
+		// 鍔犲叆鍓╀笅鐨�
+
+		// orderCM = new Comparator<TaoBaoOrder>() {
+		//
+		// @Override
+		// public int compare(TaoBaoOrder o1, TaoBaoOrder o2) {
+		//
+		// if (o1.getAuctionId() - o2.getAuctionId() != 0)
+		// return (int) ((o1.getAuctionId() - o2.getAuctionId())
+		// / Math.abs(o1.getAuctionId() - o2.getAuctionId()));
+		// else
+		// o1.getAuctionId()
+		// }
+		// };
+		//
+		// hongBaoCM = new Comparator<HongBao>() {
+		// @Override
+		// public int compare(HongBao o1, HongBao o2) {
+		// return (int) ((o1.getAuctionId() - o2.getAuctionId())
+		// / Math.abs(o1.getAuctionId() - o2.getAuctionId()));
+		// }
+		// };
+
+		if (orderList.size() > 0) {
+			Collections.sort(orderList, orderCM);
+			validTaoBaoOrderList.addAll(orderList);
+		}
+
+		if (hongBaoList.size() > 0) {
+			Collections.sort(hongBaoList, hongBaoCM);
+			validHongBaoList.addAll(hongBaoList);
+		}
+		List<TaobaoOrderHongBao> list = new ArrayList<>();
+		for (int i = 0; i < validHongBaoList.size(); i++) {
+			list.add(new TaobaoOrderHongBao(validHongBaoList.get(i), validTaoBaoOrderList.get(i)));
+		}
+		return list;
+	}
+
+	public static List<OrderItem> convertToTiChengOrder(List<HongBao> hongBaoList) {
+		List<OrderItem> orderItemList = new ArrayList<>();
+		if (hongBaoList != null)
+			for (HongBao hb : hongBaoList) {
+				OrderItem orderItem = new OrderItem();
+				orderItem.setTitle("濂栭噾璁㈠崟鍟嗗搧");
+				if (hb.getParent() != null) {
+					orderItem.setPayMoney(hb.getParent().getPayMoney());
+					orderItem.setOrderId(hb.getParent().getOrderId());
+				} else {
+					orderItem.setPayMoney(hb.getPayMoney());
+					orderItem.setOrderId(hb.getOrderId());
+				}
+
+				if (!StringUtil.isNullOrEmpty(orderItem.getOrderId())) {
+					orderItem.setOrderId(
+							orderItem.getOrderId().substring(0, orderItem.getOrderId().length() - 6) + "******");
+				}
+
+				orderItem.setFanMoney(hb.getMoney());
+
+				if (hb.getState() == HongBao.STATE_BUKELINGQU || hb.getState() == HongBao.STATE_KELINGQU) {
+					orderItem.setDesc("璁㈠崟纭鏀惰揣鐨勬鏈�25鏃ュ悗鍒拌处");
+					orderItem.setStateDesc("鏈埌璐�");
+
+				} else if (hb.getState() == HongBao.STATE_YILINGQU) {
+
+					orderItem.setDesc("宸茶嚜鍔ㄨ浆鍏ヤ綘鐨勪綑棰�");
+					orderItem.setStateDesc("宸插埌璐�");
+
+				} else if (hb.getState() == HongBao.STATE_SHIXIAO) {
+					if (hb.getParent() != null && hb.getParent().getBalanceTime() != null) {
+						orderItem.setDesc("鍞悗璁㈠崟鏃犲閲�");
+						orderItem.setStateDesc("宸插敭鍚�");
+					} else {
+						orderItem.setDesc("閫�娆捐鍗曟棤濂栭噾");
+						orderItem.setStateDesc("宸查��娆�");
+					}
+				}
+
+				orderItem.setCreateTime(hb.getCreatetime());
+				orderItem.setState(hb.getState());
+				orderItem.setPicture(Constant.systemCommonConfig.getDefaultOrderPicture());
+
+				orderItemList.add(orderItem);
+			}
+		return orderItemList;
+	}
+
+}

--
Gitblit v1.8.0