fanli-server.git

			@@ -151,14 +151,14 @@
			}

			// 计算一级奖金
			if (bossList.size() > 1) {
			if (bossList.size() >= 1) {
			UserTeamRate rate = orderHongBaoMoneyComputeService.getTeamRewardRate(levelList.get(0), bossList, date, 1);
			if (rate != null)
			teamRewardMap.put(rate.getUid(), rate);
			}
			// 计算二级奖金
			if (bossList.size() > 2) {
			UserTeamRate rate = orderHongBaoMoneyComputeService.getTeamRewardRate(levelList.get(0), bossList, date, 1);
			if (bossList.size() >= 2) {
			UserTeamRate rate = orderHongBaoMoneyComputeService.getTeamRewardRate(levelList.get(0), bossList, date, 2);
			if (rate != null)
			teamRewardMap.put(rate.getUid(), rate);
			}
			@@ -182,27 +182,39 @@
			String st = "";
			Long uid = bossList.get(i).getUid();

			if (teamRewardMap.get(uid) == null)
			st += "¥0";
			else
			st += "¥" + teamRewardMap.get(uid);
			if (i < 2) {
			if (teamRewardMap.get(uid) == null)
			st += "¥0";
			else
			st += "¥" + MoneyBigDecimalUtil.div(
			MoneyBigDecimalUtil.mul(moneyBigDecial, teamRewardMap.get(uid).getRate()),
			new BigDecimal(100));

			st += "+";
			st += "+";
			}

			if (teamReward2Map.get(uid) == null)
			st += "¥0";
			else
			st += "¥" + teamReward2Map.get(uid);
			if (i >= 2) {

			st += "+";
			if (teamReward2Map.get(uid) == null)
			st += "¥0";
			else
			st += "¥" + MoneyBigDecimalUtil.div(
			MoneyBigDecimalUtil.mul(moneyBigDecial, teamReward2Map.get(uid).getRate()),
			new BigDecimal(100));
			st += "+";
			}

			if (teamDividentsMap.get(uid) == null)
			st += "¥0";
			else
			st += "¥" + teamDividentsMap.get(uid);
			st += "¥" + MoneyBigDecimalUtil.div(
			MoneyBigDecimalUtil.mul(moneyBigDecial, teamDividentsMap.get(uid).getRate()),
			new BigDecimal(100));
			resultList.add(st);
			}

			Collections.reverse(resultList);

			JSONObject data = new JSONObject();
			data.put("list", resultList);

			@@ -2455,6 +2455,9 @@
			* 删除已过期时间
			*/
			private void removeOverdue() {
			if(1>0)
			return;

			List<GoodsEvaluate> list = goodsEvaluateDao.queryOverdue();
			if (list == null \|\| list.size() == 0) {
			return;
			@@ -2479,6 +2482,8 @@
			* 删除商品已下架-单品
			*/
			private void removeDownGoods() {
			if(1>0)
			return;
			try {
			List<GoodsEvaluate> list = goodsEvaluateDao.removeDownGoods();
			if (list == null \|\| list.size() == 0) {

	fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java	40 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史