From cd637932a970e7935b17d41568fe89c92775bccc Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 06 十二月 2019 17:18:27 +0800
Subject: [PATCH] 双12活动添加,邀请码发布修改，爬单新规则添加
---
fanli/src/main/java/com/yeshi/fanli/controller/h5/H5GoodsClassController.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5GoodsClassController.java b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5GoodsClassController.java
index f6869e8..11cf179 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5GoodsClassController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5GoodsClassController.java
@@ -7,12 +7,10 @@
import javax.annotation.Resource;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -21,12 +19,11 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
-import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.GsonUtil;
-import com.yeshi.fanli.util.Utils;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-import org.yeshi.utils.JsonUtil;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("api/h5/v1/class")
@@ -51,15 +48,13 @@
public void getCouponList(AcceptData acceptData, String callback, int page, PrintWriter out) {
page = page > 0 ? page : 1;
List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = taoBaoCouponService.getTaoBaoCouponList(page);
- Map<String, String> map = hongBaoManageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal proportion = hongBaoManageService.getFanLiRate();
JSONArray array = new JSONArray();
TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {
- taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, "");
+ taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), "");
array.add(gson.toJson(taoBaoGoodsBriefExtra));
}
int count = 10000;
@@ -76,9 +71,10 @@
*/
private void setTaoBaoCouponHongBao(List<TaoBaoCoupon> taoBaoCoupons) {
if (taoBaoCoupons.size() > 0) {
- String proportion = hongBaoManageService.get(Constant.HONGBAO_GOODS_PROPORTION);
+ BigDecimal proportion = hongBaoManageService.getFanLiRate();
+
for (TaoBaoCoupon taoBaoCoupon : taoBaoCoupons) {
- BigDecimal hb = TaoBaoUtil.getCouponHongBaoInfo(taoBaoCoupon, new BigDecimal(proportion));
+ BigDecimal hb = TaoBaoUtil.getCouponHongBaoInfo(taoBaoCoupon,proportion);
taoBaoCoupon.setHongbao(hb);
}
}
--
Gitblit v1.8.0