From a1538bb24b06589c24092c6847a977da21e63c00 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 10 十二月 2018 14:20:26 +0800
Subject: [PATCH] 返利与资金详情对应表
---
fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
index ed84edc..21293b1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -204,7 +204,7 @@
@RequestMapping("coupon")
public String conpon(Model model) {
List<TaoBaoCoupon> couponList = taoBaoCouponService.getTaoBaoCouponList("", 1);
- String proportion = hongBaoManageService.get(Constant.HONGBAO_GOODS_PROPORTION);
+ BigDecimal proportion = hongBaoManageService.getFanLiRate();
String jsonArr = Utils.imgListSize(JsonUtil.getApiCommonGson().toJson(couponList));
JSONArray jsonArray = JSONArray.fromObject(jsonArr);
List<TaoBaoCoupon> collection = (List<TaoBaoCoupon>) JSONArray.toCollection(jsonArray, TaoBaoCoupon.class);
@@ -226,17 +226,22 @@
}
@RequestMapping("findThreeFriendsCount")
- public void findThreeFriendsCount(long id, PrintWriter out) {
+ public void findThreeFriendsCount(long id, String callback, PrintWriter out) {
int count1 = userInfoService.findFriendsCount(id, 1);
int count2 = userInfoService.findFriendsCount(id, 2);
JSONObject data = new JSONObject();
data.put("count1", count1);
data.put("count2", count2);
- out.print(JsonUtil.loadTrueResult(data));
+
+ if (!StringUtil.isNullOrEmpty(callback)) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
+ } else {
+ out.print(JsonUtil.loadTrueResult(data));
+ }
}
@RequestMapping("findThreeFriends")
- public void findThreeFriends(long id, int type, int page, PrintWriter out) {
+ public void findThreeFriends(long id, int type, int page, String callback, PrintWriter out) {
int pageSize = 30;
List<InviteUser> list = userInfoService.getFriendsList(id, type, page, pageSize);
JSONArray array = new JSONArray();
@@ -251,7 +256,11 @@
JSONObject data = new JSONObject();
data.put("list", array);
data.put("pages", count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
- out.print(JsonUtil.loadTrueResult(data));
+ if (!StringUtil.isNullOrEmpty(callback)) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
+ } else {
+ out.print(JsonUtil.loadTrueResult(data));
+ }
}
@RequestMapping("findThreeSales")
@@ -266,7 +275,7 @@
@RequestMapping(value = "getConpon", method = RequestMethod.POST)
public void getConpon(int page, PrintWriter out) {
List<TaoBaoCoupon> taoBaoCouponList = taoBaoCouponService.getTaoBaoCouponList("", page);
- String proportion = hongBaoManageService.get(Constant.HONGBAO_GOODS_PROPORTION);
+ BigDecimal proportion = hongBaoManageService.getFanLiRate();
JSONObject data = new JSONObject();
data.put("taoBaoCouponList", Utils.imgListSize(JsonUtil.getApiCommonGson().toJson(taoBaoCouponList)));
data.put("proportion", proportion);
@@ -607,12 +616,9 @@
}
JSONObject data = new JSONObject();
List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();
- Map<String, String> map = hongBaoManageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal proportion = hongBaoManageService.getFanLiRate();
for (RecommendSectionGoods recommendSectionGoods : recommendSectionGoodsList) {
- list.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(recommendSectionGoods.getTaoBaoGoodsBrief(), proportion,
- fcRate, ""));
+ list.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(recommendSectionGoods.getTaoBaoGoodsBrief(), proportion.toString(), ""));
}
Gson gson = JsonUtil.getApiCommonGson();
--
Gitblit v1.8.0