java/IgoTravel.git

			@@ -8,6 +8,7 @@
			import com.stylefeng.guns.modular.system.model.UserRedPacketRecord;
			import com.stylefeng.guns.modular.system.service.IUserInfoService;
			import com.stylefeng.guns.modular.system.service.IUserRedPacketRecordService;
			import com.stylefeng.guns.modular.system.util.DateUtil;
			import com.stylefeng.guns.modular.system.util.ResultUtil;
			import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
			import com.stylefeng.guns.modular.system.warpper.MyRedEnvelope;
			@@ -93,7 +94,7 @@
			baseWarpper.setId(null != map.get("id") ? Integer.valueOf(String.valueOf(map.get("id"))) : 0);
			baseWarpper.setAmount(null != map.get("money") ? Double.valueOf(String.valueOf(map.get("money"))) : 0);
			baseWarpper.setName(null != map.get("name") ? String.valueOf(map.get("name")) : (language == 1 ? "指定发放" : language == 2 ? "Designated distribution" : "Distribution désignée"));
			baseWarpper.setContent(null != map.get("insertTime") ? String.valueOf(map.get("insertTime")) : "");
			baseWarpper.setContent(null != map.get("insertTime") ? DateUtil.conversionFormat(language, String.valueOf(map.get("insertTime"))) : "");
			baseWarpper.setTotalAmount(sum);
			baseWarpper.setRemainingAmount(sum1);
			baseWarppers.add(baseWarpper);
			@@ -129,10 +130,6 @@
			}
			pageNum = (pageNum - 1) * size;
			List<Map<String, Object>> list = orderPrivateCarService.queryRedEnvelope(language, uid);//专车
			// List<Map<String, Object>> list1 = orderTaxiService.queryRedEnvelope(language, uid);//出租车
			// List<Map<String, Object>> list2 = orderCrossCityService.queryRedEnvelope(language, uid);//跨城
			// list.addAll(list1);
			// list.addAll(list2);
			List<Map<String, Object>> list1 = orderLogisticsService.queryRedEnvelope(language, uid);
			list.addAll(list1);