From be67478cae6bf9308f15949a21e7d0a57a3f0ecb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 七月 2020 15:37:31 +0800
Subject: [PATCH] dubbo集成修改
---
fanli/src/main/java/com/yeshi/fanli/controller/web/TLJFreeBuyGoodsController.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/web/TLJFreeBuyGoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/web/TLJFreeBuyGoodsController.java
index 0827d95..4bda022 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/web/TLJFreeBuyGoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/web/TLJFreeBuyGoodsController.java
@@ -14,14 +14,13 @@
import com.google.gson.Gson;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.taobao.TLJFreeBuyGoods;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TLJFreeBuyGoodsService;
-import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TimeUtil;
+import org.yeshi.utils.TimeUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -33,9 +32,6 @@
@Resource
private TLJFreeBuyGoodsService tljFreeBuyGoodsService;
-
- @Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
@Resource
private HongBaoManageService hongBaoManageService;
@@ -53,7 +49,7 @@
List<TaoBaoGoodsBrief> list = tljFreeBuyGoodsService.listPreGoods(kw, page);
JSONArray array = new JSONArray();
Gson gson = new Gson();
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
+ BigDecimal fanLiRate = hongBaoManageService.getFanLiRate(acceptData.getSystem());
for (TaoBaoGoodsBrief goods : list) {
array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, fanLiRate.toString(), null)));
}
@@ -116,7 +112,7 @@
List<TLJFreeBuyGoods> listGoods = tljFreeBuyGoodsService.listByDay(day, 100);
JSONArray array = new JSONArray();
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
+ BigDecimal fanLiRate = hongBaoManageService.getFanLiRate(acceptData.getSystem());
for (TLJFreeBuyGoods sh : listGoods) {
TaoBaoGoodsBriefExtra item = TaoBaoUtil.getTaoBaoGoodsBriefExtra(sh.getGoods(), fanLiRate.toString(), null);
--
Gitblit v1.8.0