Merge branch 'div_10'

yujian

2019-05-14 efa2645b74ebfadc43ebe448370adb22aecc1ad7

 fanli/src/main/java/com/yeshi/fanli/controller/client/ActivityController.java

@@ -8,10 +8,11 @@


import javax.annotation.Resource;



import org.jsoup.Jsoup;

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 org.yeshi.utils.entity.FileUploadResult;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

@@ -22,12 +23,9 @@
import com.yeshi.fanli.entity.bus.activity.ActivityShareResult;

import com.yeshi.fanli.entity.bus.activity.RecommendActivity;

import com.yeshi.fanli.exception.ActivityException;

import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;

import com.yeshi.fanli.service.inter.activity.ActivityService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.NumberUtil;

import org.yeshi.utils.entity.FileUploadResult;



import net.sf.json.JSONObject;



@@ -97,18 +95,6 @@
      if (page <= 0)

         page = 1;

      List<RecommendActivity> list = activityService.getRecommendActivityListCache(page, Constant.PAGE_SIZE);

      // 过滤一遍

      if (list != null)

         for (RecommendActivity activity : list) {

            if (!StringUtil.isNullOrEmpty(activity.getTitle())) {

               activity.setTitle(Jsoup.parse(activity.getTitle()).text());

               if (activity.getShareCount() >= 10000)

                  activity.setShareCountShow(

                        NumberUtil.get1PointNumber(activity.getShareCount() / 10000.0) + "万");

               else

                  activity.setShareCountShow(activity.getShareCount() + "");

            }

         }

      long count = activityService.getRecommendActivityCountCache();

      JSONObject data = new JSONObject();

      data.put("data", getGson().toJson(list));

@@ -134,6 +120,9 @@
            imgList.add(uploadResult.getUrl());

         data.put("shareImgs", imgList);

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

         activityService.addShareCount(activityId, 1);

      } catch (UserShareGoodsRecordException e) {

         out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));

      } catch (ActivityException e) {

         out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));

      }

@@ -151,6 +140,9 @@
      try {

         JSONObject data = activityService.shareGoodsV2(uid, activityId);

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

         activityService.addShareCount(activityId, 1);

      } catch (UserShareGoodsRecordException e) {

         out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));

      } catch (ActivityException e) {

         out.print(JsonUtil.loadFalseResult("分享失败"));

         e.printStackTrace();

@@ -173,6 +165,8 @@
         data.put("shareTitle", result.getTitle());

         data.put("shareImgs", result.getImgList());

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

      } catch (UserShareGoodsRecordException e) {

         out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));

      } catch (ActivityException e) {

         out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));

      }

@@ -197,6 +191,7 @@
         data.put("shareTitle", result.getTitle());

         data.put("shareImgs", imgList);

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

         activityService.addShareCount(activityId, 1);

      } catch (ActivityException e) {

         out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));

      }