From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxGoodsClassController.java | 33 +--------------------------------
1 files changed, 1 insertions(+), 32 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxGoodsClassController.java b/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxGoodsClassController.java
index ebd7507..4a33958 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxGoodsClassController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxGoodsClassController.java
@@ -12,18 +12,14 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.JsonUtil;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.yeshi.fanli.controller.client.SearchController;
+import com.yeshi.fanli.controller.client.v1.SearchController;
import com.yeshi.fanli.entity.accept.AcceptData;
-import com.yeshi.fanli.entity.bus.clazz.ClassRecommendGoods;
import com.yeshi.fanli.entity.bus.clazz.GoodsClass;
import com.yeshi.fanli.entity.bus.clazz.GoodsSecondClass;
import com.yeshi.fanli.entity.bus.su.clazz.SuperGoodsClass;
import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.taobao.TaoBaoCoupon;
import com.yeshi.fanli.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.goods.ClassRecommendGoodsService;
import com.yeshi.fanli.service.inter.goods.GoodsClassService;
import com.yeshi.fanli.service.inter.goods.GoodsSecondClassService;
import com.yeshi.fanli.service.inter.goods.SuperGoodsClassService;
@@ -48,9 +44,6 @@
@Resource
private GoodsSecondClassService goodsSecondClassService;
-
- @Resource
- private ClassRecommendGoodsService classRecommendGoodsService;
@Resource
private GoodsClassService goodsClassService;
@@ -159,30 +152,6 @@
out.print(result);
}
- /**
- *
- * 鏂规硶璇存槑: 鎺ㄨ崘鍟嗗搧鑾峰彇
- *
- * @author mawurui createTime 2018骞�4鏈�25鏃� 涓嬪崍5:25:34
- * @param acceptData
- * @param goodsClassId
- * @param out
- */
- @RequestMapping(value = "getclassrecommendgoods", method = RequestMethod.POST)
- public void getClassRecommendGoods(AcceptData acceptData, long goodsClassId, PrintWriter out) {
- List<ClassRecommendGoods> classRecommendGoodsList = classRecommendGoodsService
- .getClassRecommendGoodsByGoodsClassId(goodsClassId);
- if (classRecommendGoodsList == null) {
- out.print(JsonUtil.loadFalseResult(XcxMiniControllerUtil.NODATA));
- return;
- }
- JSONObject data = new JSONObject();
- data.put("count", classRecommendGoodsList.size());
- Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
- data.put("classRecommendGoodsList", gson.toJson(classRecommendGoodsList));
- String result = JsonUtil.loadTrueResult(data);
- out.print(result);
- }
/**
*
--
Gitblit v1.8.0