From c84d8ecd97d111b01db9cfd807300d0491a95bc8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 08 一月 2019 16:38:34 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'
---
fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 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..2bfad7f 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;
@@ -64,7 +68,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;
@@ -82,10 +85,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;
@@ -146,9 +145,6 @@
private UserInfoService userInfoService;
@Resource
- private HongBaoMessageService hongBaoMessageService;
-
- @Resource
private ThreeSaleRankService threeSaleRankService;
@Resource
@@ -204,7 +200,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);
@@ -275,7 +271,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);
@@ -616,12 +612,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