From 5879fd8d7e0cc7cfb94a036545dd515381fc3e70 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 01 一月 2020 10:21:31 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicRecommendController.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicRecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicRecommendController.java
index 48a08c3..ba2e6b8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicRecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/DynamicRecommendController.java
@@ -19,13 +19,13 @@
import com.yeshi.fanli.entity.taobao.SearchFilter;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
-import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
+import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
-import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
+import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.Utils;
@@ -51,7 +51,7 @@
private TaoBaoUnionConfigService taoBaoUnionConfigService;
@Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+ private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
/**
* 鑾峰彇鍟嗗搧淇℃伅
@@ -166,8 +166,6 @@
LogHelper.test("鏍规嵁绮樿创鏉挎帹鑽�:" + text);
-
-
if (text.length() > 80) {
out.print(JsonUtil.loadFalseResult("鍊艰繃闀�"));
return;
@@ -192,11 +190,11 @@
}
// 鏌ヨ澶ф窐瀹㈡爣棰�
- List<DaTaoKeDetail> list = daTaoKeGoodsDetailService.listByDtitle(text);
+ List<DaTaoKeDetailV2> list = daTaoKeGoodsDetailV2Service.listByDtitle(text);
if (list != null && list.size() > 0) {
root.put("type", 2);
JSONObject data = new JSONObject();
- data.put("title", list.get(0).getdTitle());
+ data.put("title", list.get(0).getDtitle());
root.put("data", data);
out.print(JsonUtil.loadTrueResult(root));
return;
--
Gitblit v1.8.0