From 3d50552f1910a5d30cc5bb322f0f7984bce51624 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 03 九月 2019 15:09:20 +0800
Subject: [PATCH] 专题加入版本信息
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
index b2d98b7..ce13f06 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
@@ -2185,6 +2185,8 @@
// 绾㈠寘
if (hongBao == null) {
BigDecimal proportion = manageService.getFanLiRate();
+ if ("taolijin".equalsIgnoreCase(from))
+ proportion = manageService.getTLJShareRate(System.currentTimeMillis());
hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);
}
goodsJson.put("hongBao", hongBao);
@@ -2273,7 +2275,7 @@
// 鎺ㄥ箍绾㈠寘
if (from != null && from.equals("taolijin")) {
// 璁＄畻鎺ㄥ箍绾㈠寘
- String warningRate = configTaoLiJinService.getValueByKey("warning_value",null);
+ String warningRate = configTaoLiJinService.getValueByKey("warning_value", null);
BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods);
// 鎺ㄥ箍绾㈠寘 涓嶈兘灏忎簬1
@@ -2332,7 +2334,7 @@
data.put("userHongbao", userMoneyExtra.getTlj().setScale(2).toString());
}
- noRebateHelpLink = configTaoLiJinService.getValueByKey("share_goods_help_link",null);
+ noRebateHelpLink = configTaoLiJinService.getValueByKey("share_goods_help_link", null);
if (Constant.IS_TEST) {
fanliValid = true;
@@ -2554,23 +2556,12 @@
*/
@RequestMapping(value = "getSpecialActivities")
public void getSpecialActivities(AcceptData acceptData, Long uid, PrintWriter out) {
-
- BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
- if (system == null) {
- out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
- return;
- }
-
try {
-
+ int platformCode = Constant.getPlatformCode(acceptData.getPlatform());
+ List<Special> listSpecial = specialService.listByVersion(0, Integer.MAX_VALUE, "special_activities",
+ platformCode, Integer.parseInt(acceptData.getVersion()));
+
List<Special> list = new ArrayList<Special>();
- // 涓撻娲诲姩
- String specialCard = "special_activities";
-
- List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE, specialCard,
- system.getId());
-
if (listSpecial != null) {
list.addAll(listSpecial);
}
--
Gitblit v1.8.0