From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 173 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java
index d82691e..8af63f0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java
@@ -1,21 +1,37 @@
package com.yeshi.fanli.controller.client.v1;
import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+import com.yeshi.fanli.dto.order.UserTeamLevel;
+import com.yeshi.fanli.dto.order.UserTeamRate;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.help.AppPageNotification;
+import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
import com.yeshi.fanli.service.inter.help.AppPageNotificationService;
+import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
+import com.yeshi.fanli.service.manger.AppUpdateManager;
+import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.VersionUtil;
-import org.yeshi.utils.JsonUtil;
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("api/v1/help")
@@ -23,6 +39,12 @@
@Resource
private AppPageNotificationService appPageNotificationService;
+
+ @Resource
+ private AppUpdateManager appUpdateManager;
+
+ @Resource
+ private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
/**
* 鑾峰彇app椤甸潰鐨勯�氱煡
@@ -38,13 +60,23 @@
return;
}
- AppPageNotification ap = appPageNotificationService.getAppPageNotificationByTypeCache(type);
- if ("home".equalsIgnoreCase(type)
- && VersionUtil.smallerThan_1_5_1(acceptData.getPlatform(), acceptData.getVersion()) && ap != null) {
- ap.setCanClose(false);
- ap.setContent("灏婃暚鐨勭敤鎴凤紝涓烘洿鍔犲噯纭珮鏁堢殑涓轰綘杩斿埄銆佺渷閽憋紝璇峰崌绾у埌杩斿埄鍒告渶鏂扮増鏈�");
+ String platform = acceptData.getPlatform();
+ String version = acceptData.getVersion();
+
+ AppPageNotification ap = appPageNotificationService.getValidNotificationByTypeCache(type, platform,
+ Integer.parseInt(version));
+ if ("home".equalsIgnoreCase(type) && VersionUtil.smallerThan_1_5_1(platform, version) && ap != null) {
+ AppPageNotification no = new AppPageNotification();
+ no.setContentUrl("");
+ no.setMd5("111111111111111111");
+ no.setPageName(ap.getPageName());
+ no.setShow(true);
+ no.setType(ap.getType());
+ no.setUpdateTime(ap.getUpdateTime());
+ no.setCanClose(false);
+ no.setContent(String.format("灏婃暚鐨勭敤鎴凤紝涓烘洿鍔犲噯纭珮鏁堢殑涓轰綘杩斿埄銆佺渷閽憋紝璇峰崌绾у埌%s鏈�鏂扮増鏈�", Constant.getAppName(platform, version)));
Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
- out.print(JsonUtil.loadTrueResult(gson.toJson(ap)));
+ out.print(JsonUtil.loadTrueResult(gson.toJson(no)));
return;
}
@@ -57,4 +89,138 @@
}
}
+ @RequestMapping(value = "updateApp")
+ public void updateApp(AcceptData acceptData, PrintWriter out) {
+ if (Constant.IS_TEST)
+ acceptData.setVersion("20");
+ String result = appUpdateManager.getUpdateInfoCache(acceptData);
+ try {
+ out.print(new String(result.getBytes("ISO-8859-1"), "UTF-8"));
+ } catch (UnsupportedEncodingException e) {
+ out.print(result);
+ }
+ }
+
+ @RequestMapping(value = "computeCommission")
+ public void computeCommission(AcceptData acceptData, String list, String money, String callback, PrintWriter out) {
+
+ money = money.replace("楼", "").trim();
+
+ BigDecimal moneyBigDecial = null;
+
+ try {
+ moneyBigDecial = new BigDecimal(money);
+ } catch (Exception e) {
+
+ }
+
+ if (moneyBigDecial == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璧勯噾鏍煎紡涓嶅"));
+ return;
+ }
+
+ List<UserLevelEnum> levelList = new ArrayList<UserLevelEnum>();
+ net.sf.json.JSONArray array = net.sf.json.JSONArray.fromObject(list);
+ for (int i = 0; i < array.size(); i++)
+ levelList.add(UserLevelEnum.valueOf(array.optString(i)));
+
+ Collections.reverse(levelList);
+
+ BigDecimal fanLiRate = orderHongBaoMoneyComputeService.getFanliRate(levelList.get(0), new Date());
+
+ moneyBigDecial=MoneyBigDecimalUtil.divUp(moneyBigDecial.multiply(new BigDecimal(100)), fanLiRate);
+
+ List<UserTeamLevel> bossList = new ArrayList<>();
+ if (levelList.size() > 1)
+ for (int i = 1; i < levelList.size(); i++) {
+ bossList.add(new UserTeamLevel(10000L + i, levelList.get(i)));
+ }
+
+ Date date = new Date();
+
+ List<UserTeamRate> rateList = null;
+
+ Map<Long, UserTeamRate> teamRewardMap = new HashMap<>();
+ Map<Long, UserTeamRate> teamReward2Map = new HashMap<>();
+ Map<Long, UserTeamRate> teamDividentsMap = new HashMap<>();
+
+ // 璁＄畻浜岀骇澶栧垎绾�
+ List<UserTeamRate> moreThan2LevelList = orderHongBaoMoneyComputeService
+ .getTeamRewardMoreThan2LevelRates(levelList.get(0), bossList, date);
+ if (moreThan2LevelList != null)
+ for (UserTeamRate rate : moreThan2LevelList) {
+ teamReward2Map.put(rate.getUid(), rate);
+ }
+
+ // 璁＄畻涓�绾у閲�
+ 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, 2);
+ if (rate != null)
+ teamRewardMap.put(rate.getUid(), rate);
+ }
+
+ // 璁＄畻鍒嗙孩
+ rateList = orderHongBaoMoneyComputeService.getTeamDividentsRates(levelList.get(0), bossList, date);
+ if (rateList != null)
+ for (UserTeamRate rate : rateList) {
+ teamDividentsMap.put(rate.getUid(), rate);
+ }
+
+ BigDecimal fanliRate = orderHongBaoMoneyComputeService.getFanliRate(levelList.get(0), date);
+
+ List<String> resultList = new ArrayList<>();
+
+ resultList.add(
+ "楼" + MoneyBigDecimalUtil.div(MoneyBigDecimalUtil.mul(moneyBigDecial, fanliRate), new BigDecimal(100)));
+
+ for (int i = 0; i < bossList.size(); i++) {
+ //
+ String st = "";
+ Long uid = bossList.get(i).getUid();
+
+ 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 += "+";
+ }
+
+ if (i >= 2) {
+
+ 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 += "楼" + 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);
+
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ }
+
}
--
Gitblit v1.8.0