删除 RecommendSectionGoods相关+推送版本调整

yujian

2019-03-19 b3d001c65da02bdc83e92308cd23ed1525c98070

 fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java

@@ -24,12 +24,10 @@
import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.wx.WXUtil;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.taobao.api.ApiException;

import com.yeshi.fanli.entity.bus.recommend.RecommendDetails;

import com.yeshi.fanli.entity.bus.recommend.RecommendSectionDetail;

import com.yeshi.fanli.entity.bus.recommend.RecommendSectionGoods;

import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;

import com.yeshi.fanli.entity.bus.user.InviteUser;

import com.yeshi.fanli.entity.bus.user.UserInfo;

@@ -51,17 +49,14 @@
import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.SystemClientParamsService;

import com.yeshi.fanli.service.inter.config.SystemConfigService;

import com.yeshi.fanli.service.inter.goods.ClassRecommendGoodsService;

import com.yeshi.fanli.service.inter.goods.GoodsSecondClassService;

import com.yeshi.fanli.service.inter.goods.RecommendDetailsService;

import com.yeshi.fanli.service.inter.goods.RecommendSectionDetailService;

import com.yeshi.fanli.service.inter.goods.RecommendSectionGoodsService;

import com.yeshi.fanli.service.inter.goods.RecommendSectionService;

import com.yeshi.fanli.service.inter.goods.ShareGoodsService;

import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;

import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleRankService;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.user.ShamUserService;

@@ -92,13 +87,10 @@


   @Resource

   private GoodsSecondClassService goodsSecondClassService;



   @Resource

   private ClassRecommendGoodsService classRecommendGoodsService;



	
   @Resource

   private ConfigService configService;

	


   @Resource

   private HongBaoManageService hongBaoManageService;



@@ -113,8 +105,6 @@
   @Resource

   private RecommendSectionService recommendSectionService;



   @Resource

   private RecommendSectionGoodsService recommendSectionGoodsService;



   @Resource

   private RecommendSectionDetailService recommendSectionDetailService;

@@ -124,9 +114,6 @@


   @Resource

   private UserInfoService userInfoService;



   @Resource

   private ThreeSaleRankService threeSaleRankService;



   @Resource

   private BusinessSystemService businessSystemService;

@@ -153,7 +140,6 @@
         + Constant.systemCommonConfig.getAndroidPackageName();



   private static final String DOWNURL2 = "http://121.42.200.138/apk/fanliquan20180124.apk";





   @RequestMapping("coupon")

   public String conpon(Model model) {

@@ -214,7 +200,6 @@
      data.put("proportion", proportion);

      out.print(JsonUtil.loadTrueResult(data));

   }





   @RequestMapping("share")

   public String getShare(Model model, String uid) {

@@ -499,27 +484,6 @@
      JSONObject data = new JSONObject();

      data.put("picUrl", recommendSectionDetail.getPicUrl());

      data.put("html", recommendSectionDetail.getHtmlCode());

      out.println(JsonUtil.loadTrueResult(data));

   }



   @RequestMapping("getRecommendSectionGoodsList")

   public void getRecommendSectionGoodsList(long id, PrintWriter out) {

      List<RecommendSectionGoods> recommendSectionGoodsList = recommendSectionGoodsService

            .getRecommendSectionGoods(id, Integer.MAX_VALUE);

      if (recommendSectionGoodsList == null) {

         JsonUtil.loadFalseResult("商品为空！");

         return;

      }

      JSONObject data = new JSONObject();

      List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();

      BigDecimal proportion = hongBaoManageService.getFanLiRate();

      for (RecommendSectionGoods recommendSectionGoods : recommendSectionGoodsList) {

         list.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(recommendSectionGoods.getTaoBaoGoodsBrief(),

               proportion.toString(), ""));

      }



      Gson gson = JsonUtil.getApiCommonGson();

      data.put("goodsList", gson.toJson(list));

      out.println(JsonUtil.loadTrueResult(data));

   }