From df300df7832cc3d24f1b09297998e8bee8cfd126 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 20 八月 2019 18:06:43 +0800
Subject: [PATCH] 签到弹框bug
---
fanli/src/main/java/com/yeshi/fanli/controller/web/WebGoodsClassController.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 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..2f6c099 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
@@ -6,42 +6,41 @@
import javax.annotation.Resource;
-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.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.taobao.TaoBaoCoupon;
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.util.taobao.TaoBaoUtil;
-import org.yeshi.utils.JsonUtil;
+
+import net.sf.json.JSONObject;
@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
*/
- @RequestMapping(value = "getCouponList", method = RequestMethod.GET)
+ @RequestMapping(value = "getCouponList")
public void getCouponList(AcceptData acceptData, String callback, int page, PrintWriter out) {
List<TaoBaoCoupon> taoBaoCoupons = taoBaoCouponService.getTaoBaoCouponListBykeys(null, page);
int count = taoBaoCouponService.getCount("");
@@ -52,7 +51,7 @@
data.put("count", count);
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
}
-
+
/**
* 璁剧疆绾㈠寘杩涘幓
*
@@ -60,9 +59,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