From eb1adc13eda955e8ef0fc9fe41fb246fa89b722d Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 06 五月 2020 14:03:56 +0800
Subject: [PATCH] 队员相关

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
index 4f063a0..d702bcf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
@@ -59,6 +59,7 @@
 import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
 import com.yeshi.fanli.service.inter.jd.JDGoodsClassService;
 import com.yeshi.fanli.service.inter.money.UserMoneyExtraService;
+import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
 import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
 import com.yeshi.fanli.service.inter.redpack.UserTaoLiJinNewbiesService;
 import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;
@@ -152,7 +153,7 @@
 	private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
 
 	@Resource
-	private HongBaoManageService hongBaoManageService;
+	private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
 
 	@Resource
 	private SystemClientParamsService systemClientParamsService;
@@ -210,6 +211,9 @@
 
 	@Resource
 	private UserLevelManager userLevelManager;
+	
+	@Resource
+	private HongBaoManageService hongBaoManageService;
 
 	private ConfigParamsDTO getParamsDTO(String platform, String version, Long uid) {
 		UserLevelEnum level = UserLevelEnum.daRen;
@@ -222,7 +226,7 @@
 		}
 		if (level == null)
 			level = UserLevelEnum.daRen;
-		return hongBaoManageService.getShowComputeRate(platform, version, level);
+		return orderHongBaoMoneyComputeService.getShowComputeRate(platform, version, level);
 	}
 
 	/**
@@ -1342,6 +1346,7 @@
 		PDDPromotionUrl convertUrl = PinDuoDuoApiUtil.convert(id, PinDuoDuoApiUtil.PID_FANLI + "", uid + "");
 		JSONObject data = new JSONObject();
 		data.put("native", true);
+
 		data.put("jumpLink", convertUrl.getUrl());
 		data.put("nativeJumpLink", PinDuoDuoUtil.getAndroidNativeURI(convertUrl.getUrl()));
 		out.print(JsonUtil.loadTrueResult(data));

--
Gitblit v1.8.0