From 91d0826fffcc79d5869b15fffe4392399d23f0b1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 26 四月 2020 17:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5PushController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5PushController.java b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5PushController.java
index cf5c8e5..4e8fcf3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5PushController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5PushController.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller.apph5;
import java.io.PrintWriter;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -22,7 +23,7 @@
import com.yeshi.fanli.entity.push.PushGoodsGroup;
import com.yeshi.fanli.entity.push.PushGoodsRecord;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.push.DeviceActiveService;
import com.yeshi.fanli.service.inter.push.PushGoodsGroupService;
import com.yeshi.fanli.service.inter.push.PushGoodsRecordService;
@@ -60,6 +61,9 @@
@Resource
private PushGoodsRecordService pushGoodsRecordService;
+
+ @Resource
+ private HongBaoManageService hongBaoManageService;
/**
* 鎺ㄩ�佸晢鍝佽鎯呴〉
@@ -92,8 +96,7 @@
if (list != null && list.size() > 0) {
Map<String, String> map = manageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal proportion = hongBaoManageService.getFanLiRate();
for (PushGoodsGroup pushGoodsGroup : list) {
CommonGoods commonGoods = pushGoodsGroup.getCommonGoods();
@@ -117,7 +120,7 @@
commonGoods.setPicture(TbImgUtil.getTBSize320Img(pictUrl));
}
- array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion, fcRate, null)));
+ array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion.toString(), null)));
}
}
--
Gitblit v1.8.0