fanli-server.git

			@@ -377,14 +377,14 @@
			// TODO 验证是否是导师

			JSONObject inner = new JSONObject();
			inner.put("link", userVipConfigService.getByKey("vip_link"));
			inner.put("link", userVipConfigService.getValueByKey("vip_link"));
			inner.put("ion", "http://img.flqapp.com/resource/vip/icon_vip.png");
			inner.put("title", "免费升级享会员权益");
			inner.put("btnName", "升级会员");
			if (uid != null) {
			// 是否导师 TODO
			if (userVIPInfoService.isVIP(uid)) {
			inner.put("link", userVipConfigService.getByKey("vip_link"));
			inner.put("link", userVipConfigService.getValueByKey("vip_link"));
			inner.put("ion", "http://img.flqapp.com/resource/vip/icon_tearcher.png");
			inner.put("title", "拿五险与津贴享导师权益");
			inner.put("btnName", "升级会员");

			@@ -655,7 +655,7 @@
			lowerSubsidy = MoneyBigDecimalUtil.div(teamSubsidy.multiply(daRenRate), originRate);
			}

			if (userLevel != UserLevelEnum.superVIP && userLevel != UserLevelEnum.superVIP) {
			if (userLevel != UserLevelEnum.superVIP && userLevel != UserLevelEnum.tearcher) {
			BigDecimal vipRate = orderHongBaoMoneyComputeService.getTeamSubsidyRate(downTime, buyerUserLevel,
			UserLevelEnum.superVIP, direct);
			upperTotalMoney = upperTotalMoney.add(MoneyBigDecimalUtil.div(teamSubsidy.multiply(vipRate), originRate));
			@@ -689,7 +689,6 @@

			// 上级返利
			if (upperLevel != null) {
			upperTotalMoney = upperTotalMoney.add(hongBao);
			orderRebateVO.setUpperFanLi("¥" + upperTotalMoney);
			orderRebateVO.setJumpLink(upperLevel.getDetailLink());
			}

			@@ -279,6 +279,9 @@

			@Override
			public void teamReceive(Long uid, BigDecimal money, BigDecimal balance, Date receivedDate) {
			if (money == null \|\| money.compareTo(new BigDecimal(0)) <= 0) {
			return;
			}
			MsgMoneyDetail detail = MsgMoneyDetailFactory.createTeamReceivedMsg(uid, money, balance, receivedDate, "团队收益");
			try {
			msgMoneyDetailService.addMsgMoneyDetail(detail);

	fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史