fanli-server.git

			@@ -169,6 +169,7 @@
			}

			/**
			* 板栗商城使用
			*
			* @param giveRecord
			* @return
			@@ -183,7 +184,7 @@
			RedPackDetail detail = new RedPackDetail();
			detail.setDisplay(false);
			detail.setUid(uid);
			detail.setMoney(money);
			detail.setMoney(new BigDecimal(0).subtract(money));
			detail.setType(RedPackDetailTypeEnum.useByShopOrder);
			detail.setTitle(title);
			detail.setIdentifyCode(StringUtil.Md5(RedPackDetailTypeEnum.useByShopOrder.name() + "-" + orderId));
			@@ -192,9 +193,9 @@
			return detail;
			}


			/**
			* 新人奖励
			*
			* @param winInvite
			* @return
			* @throws RedPackDetailException
			@@ -202,7 +203,7 @@
			public static RedPackDetail createNewUserReward(Long uid, Integer num, BigDecimal money) throws RedPackDetailException {
			if (uid == null \|\| num == null \|\| money == null)
			throw new RedPackDetailException(1, "获得记录不能为空");

			// 红包明细- 退回红包
			RedPackDetail detail = new RedPackDetail();
			detail.setDisplay(true);
			detail.setUid(uid);
			@@ -217,6 +218,7 @@

			/**
			* 立得现金
			*
			* @param winInvite
			* @return
			* @throws RedPackDetailException
			@@ -240,6 +242,7 @@

			/**
			* 递增奖励 + 好友完成分享订单
			*
			* @param winInvite
			* @return
			* @throws RedPackDetailException
			@@ -261,9 +264,9 @@
			return detail;
			}


			/**
			* 连续奖励 + 好友完成分享订单
			*
			* @param winInvite
			* @return
			* @throws RedPackDetailException
			@@ -284,7 +287,6 @@
			detail.setCreateTime(new Date());
			return detail;
			}


			public static RedPackDetail createShopOrderDrawBack(Long orderId, Long uid, String title, String setName,
			BigDecimal money) throws RedPackDetailException {