From eed607d87b2eee1f09b4a28da614f3ad0b46601d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 三月 2019 16:14:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxRecommendController.java | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxRecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxRecommendController.java
index 6c9cfa3..dd6263f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxRecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxRecommendController.java
@@ -8,6 +8,7 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -20,9 +21,6 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.JumpDetailService;
import com.yeshi.fanli.service.inter.config.SystemConfigService;
-import com.yeshi.fanli.service.inter.config.SystemService;
-import com.yeshi.fanli.service.inter.goods.CollectionGoodsService;
-import com.yeshi.fanli.service.inter.goods.HonestService;
import com.yeshi.fanli.service.inter.goods.RecommendBannerService;
import com.yeshi.fanli.service.inter.goods.RecommendSectionGoodsService;
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
@@ -43,7 +41,6 @@
import com.yeshi.fanli.util.taobao.DaTaoKeUtil;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-import org.yeshi.utils.JsonUtil;
import net.sf.json.JSONObject;
@@ -53,9 +50,6 @@
@Resource
private RecommendBannerService recommendService;
-
- @Resource
- private SystemService systemService;
@Resource
private ShareGoodsService shareGoodsService;
@@ -105,11 +99,8 @@
@Resource
private SystemConfigService systemConfigService;
- @Resource
- private HonestService honestService;
- @Resource
- private CollectionGoodsService collectionGoodsService;
+
@Resource
private HongBaoManageMapper hongBaoManageMapper;
@@ -146,7 +137,7 @@
return;
}
/*
- * System system = xcxMiniControllerUtil.getSystem(acceptData); // 娣樼壒浠�
+ * BusinessSystem system = xcxMiniControllerUtil.getSystem(acceptData); // 娣樼壒浠�
* if (system.getId() == 7) { system =
* systemService.getSystem("ANDROID", "com.yeshi.ec.rebate"); }
*
--
Gitblit v1.8.0