Merge remote-tracking branch 'origin/master'

admin

2019-03-14 eed607d87b2eee1f09b4a28da614f3ad0b46601d

 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"); }

       *