From 8cb7ec4a35a38ae91d0eed17cde711e81d2b2bbf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:37:49 +0800
Subject: [PATCH] 合并
---
fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java | 36 +++++++++++++++++-------------------
1 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java
index c8bff65..d8e0d44 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java
@@ -15,27 +15,19 @@
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.taobao.TbImgUtil;
-import com.taobao.api.ApiException;
import com.yeshi.fanli.entity.accept.AcceptData;
-import com.yeshi.fanli.entity.bus.recommend.DynamicRecommend;
-import com.yeshi.fanli.entity.bus.recommend.RecommendDetails;
-import com.yeshi.fanli.entity.bus.recommend.RecommendReply;
-import com.yeshi.fanli.entity.taobao.RelateGoods;
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.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.goods.RecommendDetailsService;
-import com.yeshi.fanli.service.inter.goods.RecommendReplyService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
-import com.yeshi.fanli.service.inter.user.DynamicRecommendService;
+import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
-import com.yeshi.fanli.util.GsonUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.Utils;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import net.sf.json.JSONObject;
@@ -47,15 +39,6 @@
private HongBaoManageService hongBaoManageService;
@Resource
- private DynamicRecommendService dynamicRecommendService;
-
- @Resource
- private RecommendDetailsService recommendDetailsService;
-
- @Resource
- private RecommendReplyService recommendReplyService;
-
- @Resource
private UserInfoService userInfoService;
@Resource
@@ -63,6 +46,9 @@
@Resource
private TaoBaoUnionConfigService taoBaoUnionConfigService;
+
+ @Resource
+ private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
/**
* 鑾峰彇鍟嗗搧淇℃伅
@@ -188,6 +174,18 @@
return;
}
}
+
+ // 鏌ヨ澶ф窐瀹㈡爣棰�
+ List<DaTaoKeDetail> list = daTaoKeGoodsDetailService.listByDtitle(text);
+ if (list != null && list.size() > 0) {
+ root.put("type", 2);
+ JSONObject data = new JSONObject();
+ data.put("title", list.get(0).getdTitle());
+ root.put("data", data);
+ out.print(JsonUtil.loadTrueResult(root));
+ return;
+ }
+
out.print(JsonUtil.loadFalseResult("鏆備笉鏀寔璇ョ被鍨嬶紒"));
return;
}
--
Gitblit v1.8.0