From a8e45a802600ca1cde28fe8522a26635328bbd99 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 三月 2019 17:45:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxRecommendController.java | 13 +------------
1 files changed, 1 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 df77830..624c789 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
@@ -21,8 +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.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;
@@ -35,7 +33,6 @@
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.user.ScanHistoryService;
-import com.yeshi.fanli.service.inter.user.ShareManageService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
@@ -52,9 +49,6 @@
@Resource
private RecommendBannerService recommendService;
-
- @Resource
- private SystemService systemService;
@Resource
private ShareGoodsService shareGoodsService;
@@ -81,9 +75,6 @@
private ScanHistoryService scanHistoryService;
@Resource
- private ShareManageService shareManageService;
-
- @Resource
private ConfigService configService;
@Resource
@@ -104,8 +95,6 @@
@Resource
private SystemConfigService systemConfigService;
- @Resource
- private HonestService honestService;
@@ -144,7 +133,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