From 35ab4226899cba623b38441250920b3773325518 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 10 十二月 2018 10:33:41 +0800
Subject: [PATCH] 红包返利比例引用修改
---
fanli/src/main/java/com/yeshi/fanli/controller/web/WebGoodsClassController.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/web/WebGoodsClassController.java b/fanli/src/main/java/com/yeshi/fanli/controller/web/WebGoodsClassController.java
index ff6d5a8..c8ef984 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/web/WebGoodsClassController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/web/WebGoodsClassController.java
@@ -14,6 +14,7 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.taobao.TaoBaoCoupon;
+import com.yeshi.fanli.exception.HongBaoManageException;
import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.util.Constant;
@@ -25,18 +26,18 @@
@Controller
@RequestMapping("api/web/v1/class")
public class WebGoodsClassController {
-
+
@Resource
private TaoBaoCouponService taoBaoCouponService;
-
+
@Resource
private HongBaoManageService hongBaoManageService;
-
+
/**
*
* 鏂规硶璇存槑: 鑾峰彇浼樻儬鍒搁〉闈㈠晢鍝佸垪琛�
- * @author mawurui
- * createTime 2018骞�5鏈�11鏃� 涓嬪崍2:41:16
+ *
+ * @author mawurui createTime 2018骞�5鏈�11鏃� 涓嬪崍2:41:16
* @param acceptData
* @param page
* @param out
@@ -52,7 +53,7 @@
data.put("count", count);
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
}
-
+
/**
* 璁剧疆绾㈠寘杩涘幓
*
@@ -60,9 +61,9 @@
*/
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