From f4fa74c0347e2e82a4df10d0a4a41fa6b45c9325 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 三月 2019 09:34:52 +0800
Subject: [PATCH] 专题对象 清理 hibernate引入
---
fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java
index 017382a..4e8981c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java
@@ -27,7 +27,7 @@
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
-import com.yeshi.fanli.service.inter.config.SystemService;
+import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
import com.yeshi.fanli.service.inter.goods.GoodsClassService;
import com.yeshi.fanli.service.inter.goods.TaoBaoClassService;
@@ -76,9 +76,6 @@
private TaoBaoClassService taoBaoClassService;
@Resource
- private SystemService systemService;
-
- @Resource
private QualityGoodsService qualityGoodsService;
@Resource
@@ -89,6 +86,10 @@
@Resource
private HongBaoManageService hongBaoManageService;
+
+ @Resource
+ private ConfigService configService;
+
/**
* 9.9鍟嗗搧
@@ -1222,10 +1223,18 @@
long count = qualityGoodsService.countFreeGoods(tkRate, lableName);
+
JSONObject data = new JSONObject();
+ if (page == 1) {
+ // 鎶藉瑙勫垯
+ String rules = configService.get("free_goods_rule");
+ data.put("ruleLink", rules);
+ }
+
data.put("count", count);
data.put("result_list", array);
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
--
Gitblit v1.8.0