From 1bcfd2d6949bff749cec105f2f56d107edb519e5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 三月 2019 10:48:19 +0800
Subject: [PATCH] 增加配置信息
---
fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java | 51 +++++++++------------------------------------------
1 files changed, 9 insertions(+), 42 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 b0a3ec9..60ca6b8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -21,6 +21,10 @@
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.HttpUtil;
+import org.yeshi.utils.JsonUtil;
+import org.yeshi.utils.NumberUtil;
+import org.yeshi.utils.wx.WXUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -31,9 +35,7 @@
import com.yeshi.fanli.entity.bus.recommend.RecommendSectionDetail;
import com.yeshi.fanli.entity.bus.recommend.RecommendSectionGoods;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;
-import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.entity.bus.user.InviteUser;
-import com.yeshi.fanli.entity.bus.user.ThreeSaleRank;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.system.CustomerContent;
import com.yeshi.fanli.entity.system.CustomerName;
@@ -64,8 +66,6 @@
import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoMessageService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleRankService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
@@ -82,10 +82,6 @@
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.util.wx.WXLoginUtil;
-import org.yeshi.utils.HttpUtil;
-import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.NumberUtil;
-import org.yeshi.utils.wx.WXUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -140,13 +136,7 @@
private ThreeSaleSerivce threeSaleSerivce;
@Resource
- private HongBaoService hongBaoService;
-
- @Resource
private UserInfoService userInfoService;
-
- @Resource
- private HongBaoMessageService hongBaoMessageService;
@Resource
private ThreeSaleRankService threeSaleRankService;
@@ -204,25 +194,13 @@
@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);
model.addAttribute("couponList", collection);
model.addAttribute("proportion", proportion);
return "coupon";
- }
-
- @RequestMapping("findThreeSaleInfo")
- public void findThreeSaleInfo(long id, PrintWriter out) {
- int count = threeSaleSerivce.findInviteCount(id);
- double money = hongBaoService.findThreeSaleMoney(id);
- List<ThreeSaleRank> list = threeSaleRankService.rank(5);
- JSONObject data = new JSONObject();
- data.put("count", count);
- data.put("money", money);
- data.put("list", list);
- out.print(JsonUtil.loadTrueResult(data));
}
@RequestMapping("findThreeFriendsCount")
@@ -263,19 +241,10 @@
}
}
- @RequestMapping("findThreeSales")
- public void findThreeSales(long id, PrintWriter out) {
- List<HongBao> list = hongBaoService.findThreeSaleHongBao(id);
- String json = JsonUtil.getApiCommonGson().toJson(list);
- JSONObject data = new JSONObject();
- data.put("list", json);
- out.print(JsonUtil.loadTrueResult(data));
- }
-
@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);
@@ -616,12 +585,10 @@
}
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