From fe646416d8d46de7b896ddbf65a3ad0cd30b729b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 七月 2020 16:05:56 +0800
Subject: [PATCH] 大淘客与好单库与主包剥离
---
fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5PushController.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 0b274b9..4ff6bb3 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
@@ -23,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;
@@ -95,8 +95,8 @@
if (list != null && list.size() > 0) {
- Map<String, String> map = manageService.convertMap();
- BigDecimal proportion = hongBaoManageService.getFanLiRate();
+ Map<String, String> map = manageService.convertMap(acceptData.getSystem());
+ BigDecimal proportion = hongBaoManageService.getFanLiRate(acceptData.getSystem());
for (PushGoodsGroup pushGoodsGroup : list) {
CommonGoods commonGoods = pushGoodsGroup.getCommonGoods();
--
Gitblit v1.8.0