fanli-server.git

			@@ -355,215 +355,185 @@
			return detail;
			}

			/**
			* 邀请赚维权
			*
			* @param uid
			* @param orderId
			* @param money
			* @param balance
			* @param beiZhu
			* @return
			*/
			public static MsgMoneyDetail createInviteWeiQuanMsg(Long uid, String orderId, int orderType, BigDecimal money,
			BigDecimal balance, String beiZhu) {
			if (money == null \|\| orderId == null \|\| money == null \|\| uid == null)
			return null;
			// /**
			// * 邀请赚维权
			// *
			// * @param uid
			// * @param orderId
			// * @param money
			// * @param balance
			// * @param beiZhu
			// * @return
			// */
			// public static MsgMoneyDetail createInviteWeiQuanMsg(Long uid, String orderId, int orderType, BigDecimal money,
			// BigDecimal balance, String beiZhu) {
			// if (money == null \|\| orderId == null \|\| money == null \|\| uid == null)
			// return null;
			//
			// MsgMoneyDetail detail = new MsgMoneyDetail();
			// detail.setBalance(balance);
			// detail.setBeiZhu(beiZhu);
			// detail.setCreateTime(new Date());
			// detail.setMoney(money);
			// detail.setMsgType(MsgTypeMoneyTypeEnum.inviteWeiQuan);
			// detail.setOrderId(orderId);
			// detail.setRead(false);
			// detail.setUser(new UserInfo(uid));
			// detail.setOrderType(orderType);
			//
			// return detail;
			// }
			//
			// /**
			// * 分享赚到账
			// *
			// * @param money
			// * @param balance
			// * @param orderCount
			// * @param goodsCount
			// * @param uid
			// * @param beiZhu
			// * @return
			// */
			// public static MsgMoneyDetail createShareMsg(BigDecimal money, BigDecimal balance, int orderType, int orderCount,
			// int goodsCount, Long uid, String beiZhu) {
			// if (money == null \|\| balance == null \|\| uid == null)
			// return null;
			//
			// MsgMoneyDetail detail = new MsgMoneyDetail();
			// detail.setBalance(balance);
			// detail.setBeiZhu(beiZhu);
			// detail.setCreateTime(new Date());
			// detail.setGoodsCount(goodsCount);
			// detail.setOrderType(orderType);
			// detail.setMoney(money);
			// detail.setMsgType(MsgTypeMoneyTypeEnum.share);
			// detail.setOrderCount(orderCount);
			// detail.setRead(false);
			// detail.setUser(new UserInfo(uid));
			//
			// return detail;
			// }
			//
			// /**
			// * 分享赚维权
			// *
			// * @param uid
			// * @param orderId
			// * @param money
			// * @param balance
			// * @param beiZhu
			// * @return
			// */
			// public static MsgMoneyDetail createShareWeiQuanMsg(Long uid, String orderId, int orderType, BigDecimal money,
			// BigDecimal balance, String beiZhu) {
			// if (money == null \|\| orderId == null \|\| money == null \|\| uid == null)
			// return null;
			// MsgMoneyDetail detail = new MsgMoneyDetail();
			// detail.setBalance(balance);
			// detail.setBeiZhu(beiZhu);
			// detail.setCreateTime(new Date());
			// detail.setMoney(money);
			// detail.setMsgType(MsgTypeMoneyTypeEnum.shareWeiQuan);
			// detail.setOrderId(orderId);
			// detail.setRead(false);
			// detail.setUser(new UserInfo(uid));
			// detail.setOrderType(orderType);
			// return detail;
			// }
			//
			// public static MsgMoneyDetail createOrderRewardMsg(Long uid, String orderId, int orderType, BigDecimal money,
			// BigDecimal balance, String beiZhu) {
			// if (money == null \|\| orderId == null \|\| money == null \|\| uid == null)
			// return null;
			//
			// MsgMoneyDetail detail = new MsgMoneyDetail();
			// detail.setBalance(balance);
			// detail.setBeiZhu(beiZhu);
			// detail.setCreateTime(new Date());
			// detail.setMoney(money);
			// detail.setMsgType(MsgTypeMoneyTypeEnum.orderReward);
			// detail.setOrderId(orderId);
			// detail.setRead(false);
			// detail.setOrderType(orderType);
			// detail.setUser(new UserInfo(uid));
			// return detail;
			// }
			//
			// public static MsgMoneyDetail createSystemEqualizeMsg(Long uid, String reason, BigDecimal money, BigDecimal balance,
			// String beiZhu) {
			// if (money == null \|\| money == null \|\| uid == null)
			// return null;
			//
			// MsgMoneyDetail detail = new MsgMoneyDetail();
			// detail.setBalance(balance);
			// detail.setBeiZhu(beiZhu);
			// detail.setCreateTime(new Date());
			// detail.setMoney(money);
			// detail.setMsgType(MsgTypeMoneyTypeEnum.systemEqualize);
			// detail.setOrderId(reason);
			// detail.setRead(false);
			// detail.setUser(new UserInfo(uid));
			// return detail;
			// }
			//
			// public static MsgMoneyDetail createElmeFanliMsg(Long uid, String orderId, BigDecimal money, BigDecimal balance,
			// String beiZhu) {
			// if (money == null \|\| money == null \|\| uid == null)
			// return null;
			//
			// MsgMoneyDetail detail = new MsgMoneyDetail();
			// detail.setBalance(balance);
			// detail.setBeiZhu(beiZhu);
			// detail.setCreateTime(new Date());
			// detail.setMoney(money);
			// detail.setMsgType(MsgTypeMoneyTypeEnum.fanliElme);
			// detail.setOrderId(orderId);
			// detail.setRead(false);
			// detail.setUser(new UserInfo(uid));
			// return detail;
			// }
			//
			//
			//

			MsgMoneyDetail detail = new MsgMoneyDetail();
			detail.setBalance(balance);
			detail.setBeiZhu(beiZhu);
			detail.setCreateTime(new Date());
			detail.setMoney(money);
			detail.setMsgType(MsgTypeMoneyTypeEnum.inviteWeiQuan);
			detail.setOrderId(orderId);
			detail.setRead(false);
			detail.setUser(new UserInfo(uid));
			detail.setOrderType(orderType);

			return detail;
			}

			/**
			* 分享赚到账
			*
			* @param money
			* @param balance
			* @param orderCount
			* @param goodsCount
			* @param uid
			* @param beiZhu
			* @return
			*/
			public static MsgMoneyDetail createShareMsg(BigDecimal money, BigDecimal balance, int orderType, int orderCount,
			int goodsCount, Long uid, String beiZhu) {
			if (money == null \|\| balance == null \|\| uid == null)
			return null;

			MsgMoneyDetail detail = new MsgMoneyDetail();
			detail.setBalance(balance);
			detail.setBeiZhu(beiZhu);
			detail.setCreateTime(new Date());
			detail.setGoodsCount(goodsCount);
			detail.setOrderType(orderType);
			detail.setMoney(money);
			detail.setMsgType(MsgTypeMoneyTypeEnum.share);
			detail.setOrderCount(orderCount);
			detail.setRead(false);
			detail.setUser(new UserInfo(uid));

			return detail;
			}

			/**
			* 分享赚维权
			*
			* @param uid
			* @param orderId
			* @param money
			* @param balance
			* @param beiZhu
			* @return
			*/
			public static MsgMoneyDetail createShareWeiQuanMsg(Long uid, String orderId, int orderType, BigDecimal money,
			BigDecimal balance, String beiZhu) {
			if (money == null \|\| orderId == null \|\| money == null \|\| uid == null)
			return null;
			MsgMoneyDetail detail = new MsgMoneyDetail();
			detail.setBalance(balance);
			detail.setBeiZhu(beiZhu);
			detail.setCreateTime(new Date());
			detail.setMoney(money);
			detail.setMsgType(MsgTypeMoneyTypeEnum.shareWeiQuan);
			detail.setOrderId(orderId);
			detail.setRead(false);
			detail.setUser(new UserInfo(uid));
			detail.setOrderType(orderType);
			return detail;
			}

			public static MsgMoneyDetail createOrderRewardMsg(Long uid, String orderId, int orderType, BigDecimal money,
			BigDecimal balance, String beiZhu) {
			if (money == null \|\| orderId == null \|\| money == null \|\| uid == null)
			return null;

			MsgMoneyDetail detail = new MsgMoneyDetail();
			detail.setBalance(balance);
			detail.setBeiZhu(beiZhu);
			detail.setCreateTime(new Date());
			detail.setMoney(money);
			detail.setMsgType(MsgTypeMoneyTypeEnum.orderReward);
			detail.setOrderId(orderId);
			detail.setRead(false);
			detail.setOrderType(orderType);
			detail.setUser(new UserInfo(uid));
			return detail;
			}

			public static MsgMoneyDetail createSystemEqualizeMsg(Long uid, String reason, BigDecimal money, BigDecimal balance,
			String beiZhu) {
			if (money == null \|\| money == null \|\| uid == null)
			return null;

			MsgMoneyDetail detail = new MsgMoneyDetail();
			detail.setBalance(balance);
			detail.setBeiZhu(beiZhu);
			detail.setCreateTime(new Date());
			detail.setMoney(money);
			detail.setMsgType(MsgTypeMoneyTypeEnum.systemEqualize);
			detail.setOrderId(reason);
			detail.setRead(false);
			detail.setUser(new UserInfo(uid));
			return detail;
			}

			public static MsgMoneyDetail createElmeFanliMsg(Long uid, String orderId, BigDecimal money, BigDecimal balance,
			String beiZhu) {
			if (money == null \|\| money == null \|\| uid == null)
			return null;

			MsgMoneyDetail detail = new MsgMoneyDetail();
			detail.setBalance(balance);
			detail.setBeiZhu(beiZhu);
			detail.setCreateTime(new Date());
			detail.setMoney(money);
			detail.setMsgType(MsgTypeMoneyTypeEnum.fanliElme);
			detail.setOrderId(orderId);
			detail.setRead(false);
			detail.setUser(new UserInfo(uid));
			return detail;
			}



			/**
			* 邀请订单补贴
			*
			* @param uid
			* @param date
			* @param from
			* @param money
			* @param balance
			* @param beiZhu
			* @return
			*/
			public static MsgMoneyDetail createInviteOrderSubSidyMsg(Long uid, Date date, String from, BigDecimal money,
			BigDecimal balance, String beiZhu) {
			if (money == null \|\| money == null \|\| uid == null)
			return null;

			MsgMoneyDetail detail = new MsgMoneyDetail();
			detail.setBalance(balance);
			detail.setBeiZhu(beiZhu);
			detail.setCreateTime(new Date());
			detail.setMoney(money);
			detail.setMsgType(MsgTypeMoneyTypeEnum.subSidy);
			detail.setRead(false);
			detail.setUser(new UserInfo(uid));
			Calendar calendar = Calendar.getInstance();
			calendar.setTime(date);
			detail.setStateDesc(String.format("%s年%s月额外补贴到账", calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH)));
			detail.setDesc(from);

			return detail;
			}

			/**
			* 团队奖励
			* @Title: createOrderTeamRewardMsg
			* @Description:
			* @param uid
			* @param date
			* @param from
			* @param money
			* @param balance
			* @param beiZhu
			* @return
			* MsgMoneyDetail 返回类型
			* @throws
			*/
			public static MsgMoneyDetail createOrderTeamRewardMsg(Long uid, Date date, String from, BigDecimal money,
			BigDecimal balance, String beiZhu) {
			if (money == null \|\| money == null \|\| uid == null)
			return null;

			MsgMoneyDetail detail = new MsgMoneyDetail();
			detail.setBalance(balance);
			detail.setBeiZhu(beiZhu);
			detail.setCreateTime(new Date());
			detail.setMoney(money);
			detail.setMsgType(MsgTypeMoneyTypeEnum.orderTeamReward);
			detail.setRead(false);
			detail.setUser(new UserInfo(uid));
			Calendar calendar = Calendar.getInstance();
			calendar.setTime(date);
			detail.setStateDesc(String.format("%s年%s月团队奖励到账", calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH)));
			detail.setDesc(from);

			return detail;
			}


			//
			// /**
			// * 团队奖励
			// * @Title: createOrderTeamRewardMsg
			// * @Description:
			// * @param uid
			// * @param date
			// * @param from
			// * @param money
			// * @param balance
			// * @param beiZhu
			// * @return
			// * MsgMoneyDetail 返回类型
			// * @throws
			// */
			// public static MsgMoneyDetail createOrderTeamRewardMsg(Long uid, Date date, String from, BigDecimal money,
			// BigDecimal balance, String beiZhu) {
			// if (money == null \|\| money == null \|\| uid == null)
			// return null;
			//
			// MsgMoneyDetail detail = new MsgMoneyDetail();
			// detail.setBalance(balance);
			// detail.setBeiZhu(beiZhu);
			// detail.setCreateTime(new Date());
			// detail.setMoney(money);
			// detail.setMsgType(MsgTypeMoneyTypeEnum.orderTeamReward);
			// detail.setRead(false);
			// detail.setUser(new UserInfo(uid));
			// Calendar calendar = Calendar.getInstance();
			// calendar.setTime(date);
			// detail.setStateDesc(String.format("%s年%s月团队奖励到账", calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH)));
			// detail.setDesc(from);
			//
			// return detail;
			// }
			//
			//
			/**
			* 红包相关信息
			* @param uid