From 29ca8afa441d0e01188757dc9fb2b5ec11c05c90 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期三, 28 十一月 2018 12:30:41 +0800
Subject: [PATCH] 分享赚返利规则调整
---
fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java
index 2a13672..9549a48 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java
@@ -225,7 +225,7 @@
String salesCountMidea = String.format("%.1f", sales / 10000);
taoBaoGoodsBrief.setSalesCount(salesCountMidea + "涓�");
} else {
- taoBaoGoodsBrief.setSalesCount(count + "");
+ taoBaoGoodsBrief.setSalesCount(biz30day + "");
}
// 鏀瑰彉鍥剧墖灏哄
@@ -390,7 +390,7 @@
String salesCountMidea = String.format("%.1f", sales / 10000);
taoBaoGoodsBrief.setSalesCount(salesCountMidea + "涓�");
} else {
- taoBaoGoodsBrief.setSalesCount(count + "");
+ taoBaoGoodsBrief.setSalesCount(biz30day + "");
}
// 鏀瑰彉鍥剧墖灏哄
@@ -656,13 +656,13 @@
/* 閬嶅巻鍒楄〃鏁版嵁 */
for (TaoBaoGoodsBrief taoBaoGoodsBrief : listMaterial) {
- int count = taoBaoGoodsBrief.getBiz30day();
- if (count >= 10000) {
- double sales = count;
+ int biz30day = taoBaoGoodsBrief.getBiz30day();
+ if (biz30day >= 10000) {
+ double sales = biz30day;
String salesCountMidea = String.format("%.1f", sales / 10000);
taoBaoGoodsBrief.setSalesCount(salesCountMidea + "涓�");
} else {
- taoBaoGoodsBrief.setSalesCount(count + "");
+ taoBaoGoodsBrief.setSalesCount(biz30day + "");
}
// 鏀瑰彉鍥剧墖灏哄 澶у浘鏇存竻鏅�
@@ -834,13 +834,13 @@
/* 閬嶅巻鍒楄〃鏁版嵁 */
for (TaoBaoGoodsBrief taoBaoGoodsBrief : listBrands) {
- int count = taoBaoGoodsBrief.getBiz30day();
- if (count >= 10000) {
- double sales = count;
+ int biz30day = taoBaoGoodsBrief.getBiz30day();
+ if (biz30day >= 10000) {
+ double sales = biz30day;
String salesCountMidea = String.format("%.1f", sales / 10000);
taoBaoGoodsBrief.setSalesCount(salesCountMidea + "涓�");
} else {
- taoBaoGoodsBrief.setSalesCount(count + "");
+ taoBaoGoodsBrief.setSalesCount(biz30day + "");
}
// 鏀瑰彉鍥剧墖灏哄
@@ -910,7 +910,7 @@
String salesCountMidea = String.format("%.1f", sales / 10000);
taoBaoGoodsBrief.setSalesCount(salesCountMidea + "涓�");
} else {
- taoBaoGoodsBrief.setSalesCount(count + "");
+ taoBaoGoodsBrief.setSalesCount(biz30day + "");
}
// 鏀瑰彉鍥剧墖灏哄
@@ -1000,7 +1000,7 @@
String salesCountMidea = String.format("%.1f", sales / 10000);
taoBaoGoodsBrief.setSalesCount(salesCountMidea + "涓�");
} else {
- taoBaoGoodsBrief.setSalesCount(count + "");
+ taoBaoGoodsBrief.setSalesCount(biz30day + "");
}
// 鏀瑰彉鍥剧墖灏哄
@@ -1089,7 +1089,7 @@
String salesCountMidea = String.format("%.1f", sales / 10000);
taoBaoGoodsBrief.setSalesCount(salesCountMidea + "涓�");
} else {
- taoBaoGoodsBrief.setSalesCount(count + "");
+ taoBaoGoodsBrief.setSalesCount(biz30day + "");
}
// 鏀瑰彉鍥剧墖灏哄
@@ -1127,8 +1127,6 @@
Map<String, String> map = manageService.convertMap();
String proportion = map.get("hongbao_goods_proportion");
String fcRate = map.get("hongbao_fc_ratio");
-
-
JSONArray array = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize,
proportion, fcRate);
--
Gitblit v1.8.0