Merge remote-tracking branch 'origin/master'

admin

2019-03-04 4b80d2dab78d0cef3d149a0a11240b5e39b581a3

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

@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller.client;



import java.io.PrintWriter;

import java.lang.reflect.Type;

import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Calendar;

@@ -22,6 +23,10 @@


import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.google.gson.JsonElement;

import com.google.gson.JsonPrimitive;

import com.google.gson.JsonSerializationContext;

import com.google.gson.JsonSerializer;

import com.yeshi.fanli.dao.mybatis.HongBaoManageMapper;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.homemodule.Special;

@@ -41,15 +46,17 @@
import com.yeshi.fanli.entity.bus.user.Order;

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

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

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

import com.yeshi.fanli.entity.common.ImageInfo;

import com.yeshi.fanli.entity.common.JumpDetail;

import com.yeshi.fanli.entity.common.JumpDetailV2;

import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.goods.ScanHistoryV2;

import com.yeshi.fanli.entity.system.System;

import com.yeshi.fanli.entity.system.SystemClientParams;

import com.yeshi.fanli.entity.taobao.ClientTBPid;

import com.yeshi.fanli.entity.taobao.PidUser;

import com.yeshi.fanli.entity.taobao.ScanHistory;

import com.yeshi.fanli.entity.taobao.SearchFilter;

import com.yeshi.fanli.entity.taobao.TBPid;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

@@ -58,9 +65,13 @@
import com.yeshi.fanli.entity.taobao.TaoBaoShopInfo;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;

import com.yeshi.fanli.exception.goods.CommonGoodsException;

import com.yeshi.fanli.exception.goods.ScanHistoryException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;

import com.yeshi.fanli.exception.user.UserCustomSettingsException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

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

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

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

@@ -68,9 +79,9 @@
import com.yeshi.fanli.service.inter.config.SystemService;

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

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

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.ScanHistoryV2Service;

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

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

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

@@ -84,12 +95,15 @@
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;

import com.yeshi.fanli.service.inter.monitor.MonitorService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.order.ShareGoodsActivityOrderService;

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

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

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

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

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

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

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

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

@@ -102,6 +116,7 @@
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

import com.yeshi.fanli.vo.user.UserSettingsVO;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -132,7 +147,7 @@
   private OrderService orderService;



   @Resource

   private ScanHistoryService scanHistoryService;

   private ScanHistoryV2Service scanHistoryV2Service;



   @Resource

   private ShareManageService shareManageService;

@@ -157,9 +172,6 @@


   @Resource

   private SystemConfigService systemConfigService;



   @Resource

   private HonestService honestService;



   @Resource

   private CollectionGoodsV2Service collectionGoodsV2Service;

@@ -212,6 +224,22 @@
   @Resource

   private CommonGoodsService commonGoodsService;



   @Resource

   private UserGoodsStorageService userGoodsStorageService;



   @Resource

   private JumpDetailV2Service jumpDetailV2Service;



   @Resource

   private UserCustomSettingsService userCustomSettingsService;



   @Resource

   private ShareGoodsActivityOrderService shareGoodsActivityOrderService;

	
   @Resource

   private UserInfoExtraService userInfoExtraService;




   @RequestMapping(value = "getrecommendsection")

   public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {



@@ -254,10 +282,7 @@
      JSONObject validData = null;

      Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

            .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

      Map<String, String> convertMap = hongBaoManageService.convertMap();

      String proportion = convertMap.get("hongbao_goods_proportion");

      String fcRate = convertMap.get("hongbao_fc_ratio");



      BigDecimal proportion = manageService.getFanLiRate();

      Map<Long, List<RecommendSectionGoods>> map = recommendSectionGoodsService.getAllSectionGoodsMap();

      for (int i = 0; i < size; i++) {

         validData = new JSONObject();

@@ -280,7 +305,7 @@
            JSONObject obj = JSONObject.fromObject(gson2.toJson(rss));

            String json = gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(

                  gson2.fromJson(obj.optJSONObject("taoBaoGoodsBrief").toString(), TaoBaoGoodsBrief.class),

                  proportion, fcRate, ""));

                  proportion.toString(), ""));

            obj.put("taoBaoGoodsBrief", json);

            array.add(obj);

         }

@@ -301,7 +326,7 @@
   @RequestMapping(value = "getHonestList")

   public void getHonestList(AcceptData acceptData, PrintWriter out) {

      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      List<Honest> honestList = honestService.getHonestListCache();

      List<Honest> honestList = null;

      List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);

      if ((Integer.parseInt(acceptData.getVersion()) >= 20 && "android".equalsIgnoreCase(acceptData.getPlatform()))

            || ("ios".equalsIgnoreCase(acceptData.getPlatform())

@@ -529,15 +554,13 @@
         }

      }



      Map<String, String> map = manageService.convertMap();

      String proportion = map.get("hongbao_goods_proportion");

      String fcRate = map.get("hongbao_fc_ratio");

      BigDecimal proportion = manageService.getFanLiRate();

      JSONArray array = new JSONArray();

      TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;

      Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();



      for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {

         taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, "");

         taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), "");

         array.add(gson.toJson(taoBaoGoodsBriefExtra));

      }

      JSONObject data = new JSONObject();

@@ -701,8 +724,18 @@


         data.put("tbPidInfo", clientTBPid);



         JSONObject taobaoJson = JSONObject.fromObject(gson.toJson(taoBaoGoodsBriefExtra));

         if (taoBaoGoodsBriefExtra.getImgList() != null)

            taoBaoGoodsBriefExtra.getImgList().add(0, taoBaoGoodsBriefExtra.getPictUrl());

         taobaoJson.put("imgList", taoBaoGoodsBriefExtra.getImgList());

         taobaoJson.put("saleCount", taoBaoGoodsBriefExtra.getSalesCount());// 销量（和salesCount一致，此处处理兼容）

         if (taoBaoGoodsBriefExtra.getTaoBaoQuanInfo() != null)

            taobaoJson.put("coupon", true);

         else

            taobaoJson.put("coupon", false);



         // taoBaoGoodsBriefExtra.setAuctionUrl(null);

         data.put("taobao", gson.toJson(taoBaoGoodsBriefExtra));

         data.put("taobao", taobaoJson);

         String info = configService.get("detail_prompt");

         data.put("info", info);

         String onlyInfo = configService.get("only_info");

@@ -739,16 +772,9 @@
         ThreadUtil.run(new Runnable() {

            public void run() {

               // 添加浏览记录



               ScanHistory sh = TaoBaoUtil.getScanHistory(tbb);

               sh.setDevice(acceptData.getDevice());

               sh.setSystem(systemService.getSystem(acceptData.getPlatform(), acceptData.getPackages()));

               sh.setCreatetime(new Date());

               if (uid != null && !uid.equals("")) {

                  sh.setUid(Long.parseLong(uid));

               }

               try {

                  scanHistoryService.addScanHistory(sh);

                  scanHistoryV2Service.addScanHistory(StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid),

                        acceptData.getDevice(), tbb);

               } catch (Exception e) {

                  e.printStackTrace();

               }

@@ -964,8 +990,8 @@
      goods.put("price", tb.getReservePrice().toString());

      goods.put("zkPrice", tb.getZkPrice().toString());



      String rateStr = hongBaoManageService.get("hongbao_goods_proportion");

      String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, new BigDecimal(rateStr));

      BigDecimal proportion = manageService.getFanLiRate();

      String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);

      goods.put("hongBao", hongBao);



      // 30天销量

@@ -1051,25 +1077,17 @@
      ThreadUtil.run(new Runnable() {

         public void run() {

            // 添加浏览记录

            ScanHistory sh = TaoBaoUtil.getScanHistory(goodsInfo);

            sh.setId(0);

            sh.setDevice(acceptData.getDevice());

            sh.setSystem(systemService.getSystem(acceptData.getPlatform(), acceptData.getPackages()));

            sh.setCreatetime(new Date());

            if (!StringUtil.isNullOrEmpty(tempUid)) {

               sh.setUid(Long.parseLong(tempUid));

            }

            try {

               scanHistoryService.addScanHistory(sh);

            } catch (Exception e) {

               scanHistoryV2Service.addScanHistory(

                     StringUtil.isNullOrEmpty(tempUid) ? null : Long.parseLong(tempUid), acceptData.getDevice(),

                     goodsInfo);

            } catch (NumberFormatException e) {

               e.printStackTrace();

            } catch (CommonGoodsException e) {

               e.printStackTrace();

            } catch (ScanHistoryException e) {

               e.printStackTrace();

            }



            // try {

            // taoBaoGoodsBriefService.updateTBGoodsWithNewInfo(goodsInfo);

            // } catch (Exception e) {

            //

            // }

         }

      });

   }

@@ -1223,15 +1241,13 @@


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



      Map<String, String> map = hongBaoManageService.convertMap();

      String proportion = map.get("hongbao_goods_proportion");

      String fcRate = map.get("hongbao_fc_ratio");

      BigDecimal proportion = manageService.getFanLiRate();

      if (recommendGoodsList != null)

         for (TaoBaoGoodsBrief taoBaoGoodsBrief : recommendGoodsList) {

            if (taoBaoGoodsBrief == null)

               continue;



            re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, ""));

            re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), ""));

         }

      out.print(JsonUtil.loadTrueResult(JsonUtil.getApiCommonGson().toJson(re)));

   }

@@ -1296,25 +1312,37 @@
         out.print(JsonUtil.loadFalseResult(1, "不存在该系统"));

         return;

      }

      boolean b = NumberUtil.isNumeric(uid);

      long id = 0;

      if (b) {

         id = Long.parseLong(uid);

      }

      List<ScanHistory> list = scanHistoryService.getScanHistory(sys.getId(), acceptData.getDevice(), page, 20, id);

      long count = scanHistoryService.getScanHistoryCount(sys.getId(), acceptData.getDevice(), id);

      List<ScanHistoryV2> list = scanHistoryV2Service.getScanHistoryByDeviceOrUid(

            StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), page, 20);

      long count = scanHistoryV2Service.getCountByDeviceOrUid(

            StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice());

      JSONObject data = new JSONObject();

      data.put("count", count);

      JSONArray array = new JSONArray();

      Gson gson = JsonUtil.getApiCommonGson();



      GsonBuilder gsonBuilder = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder());

      gsonBuilder.excludeFieldsWithoutExposeAnnotation();

      gsonBuilder.registerTypeAdapter(Date.class, new JsonSerializer<Date>() {

         @Override

         public JsonElement serialize(Date value, Type theType, JsonSerializationContext context) {

            if (value == null) {

               return new JsonPrimitive("");

            } else {

               return new JsonPrimitive(value.getTime() + "");

            }

         }

      });



      Gson gson = gsonBuilder.create();



      if (list != null) {

         Map<String, String> map = hongBaoManageService.convertMap();

         String proportion = map.get("hongbao_goods_proportion");

         String fcRate = map.get("hongbao_fc_ratio");

         for (ScanHistory sh : list) {

            sh.setSalesCount(TaoBaoUtil.getSaleCount(sh.getBiz30day()));

            array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(TaoBaoUtil.getTaoBaoGoodsBrief(sh),

                  proportion, fcRate, "")));

         BigDecimal proportion = manageService.getFanLiRate();

         for (ScanHistoryV2 sh : list) {

            TaoBaoGoodsBrief goods = TaoBaoUtil.convert(sh.getCommonGoods());

            goods.setId(sh.getId());

            TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), "");

            extra.setCreatetime(sh.getCreateTime());

            array.add(gson.toJson(extra));

         }

      }

      data.put("data", array);

@@ -1331,18 +1359,16 @@
         return;

      }



      long id = 0;

      if (NumberUtil.isNumeric(uid)) {

         id = Long.parseLong(uid);

      }



      if ("0".equals(type)) {

         String[] idStr = ids.split(",");

         for (String auctionIdStr : idStr) {

            scanHistoryService.deleteScanHistory(acceptData.getDevice(), sys, Long.parseLong(auctionIdStr), id);

            scanHistoryV2Service.deleteByAuctionIdAndDeviceOrUid(

                  StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(),

                  Long.parseLong(auctionIdStr));

         }

      } else {

         scanHistoryService.deleteScanHistory(acceptData.getDevice(), sys, id);

         scanHistoryV2Service.deleteByDeviceOrUid(StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid),

               acceptData.getDevice());

      }

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



@@ -1375,16 +1401,18 @@


      /**

       * 防止请求频率过高

       * 
       */

      String key = "linkParse-" + acceptData.getDevice() + "-" + id;

      if (Constant.IS_OUTNET) {

         String key = "linkParse-" + acceptData.getDevice() + "-" + id;



      String value = redisManager.getCommonString(key);

      if (!StringUtil.isNullOrEmpty(value)) {

         out.print(JsonUtil.loadFalseResult(11, "请求频率限制"));

         return;

         String value = redisManager.getCommonString(key);

         if (!StringUtil.isNullOrEmpty(value)) {

            out.print(JsonUtil.loadFalseResult(11, "请求频率限制"));

            return;

         }

         redisManager.cacheCommonString(key, "1", 5);// 5s间隔

      }

      redisManager.cacheCommonString(key, "1", 5);// 5s间隔



      TaoBaoGoodsBrief goods = null;

      try {

         goods = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id));

@@ -1423,10 +1451,10 @@
      if (page <= 1) {

         array.clear();

         Map<String, String> map = hongBaoManageService.convertMap();

         String proportion = map.get("hongbao_goods_proportion");

         String fcRate = map.get("hongbao_fc_ratio");

         BigDecimal proportion = manageService.getFanLiRate();

         if (!StringUtil.isNullOrEmpty(imei) || !StringUtil.isNullOrEmpty(idfa)) {

            long startTime = java.lang.System.currentTimeMillis();



            TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(page, 50, imei, idfa);



            if (result != null && result.getTaoBaoGoodsBriefs() != null) {

@@ -1449,7 +1477,7 @@
               Collections.shuffle(goodsList);

               goodsList = goodsList.size() > 20 ? goodsList.subList(0, 20) : goodsList;

               for (TaoBaoGoodsBrief goods : goodsList) {

                  array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion, fcRate, "")));

                  array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), "")));

               }

            } else {

               try {

@@ -1460,19 +1488,18 @@
               }

            }

         }

         JSONArray localArray = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize, proportion,

               fcRate);

         JSONArray localArray = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize,

               proportion.toString());

         array.addAll(localArray);

      } else {// 从精选库来

         Map<String, String> map = hongBaoManageService.convertMap();

         String proportion = map.get("hongbao_goods_proportion");

         String fcRate = map.get("hongbao_fc_ratio");

         array = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize, proportion, fcRate);

         BigDecimal proportion = manageService.getFanLiRate();

         array = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize, proportion.toString());

         if (array == null) {

            out.print(JsonUtil.loadFalseResult("没有更多了"));

            return;

         }

         long count = qualityGoodsService.countRecommendToIndex(proportion);

         long count = qualityGoodsService.countRecommendToIndex(proportion.toString());

      }



      JSONObject data = new JSONObject();

@@ -1594,7 +1621,8 @@
    * @param out

    */

   @RequestMapping(value = "getNewRecommendInfo")

   public void getNewRecommendInfo(AcceptData acceptData, String specialCard, String swiperCard, PrintWriter out) {

   public void getNewRecommendInfo(AcceptData acceptData, Long uid, String specialCard, String swiperCard,

         PrintWriter out) {



      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      if (system == null) {

@@ -1608,14 +1636,8 @@


            listswiper = swiperPictureService.getByBannerCard(swiperCard);



            if (listswiper != null && listswiper.size() > 0) {

               for (SwiperPicture swiperPicture : listswiper) {

                  swiperPicture.setBannerId(null);

                  swiperPicture.setCreatetime(null);

                  swiperPicture.setUpdatetime(null);

                  swiperPicture.setState(null);

                  swiperPicture.setRemark(null);

               }

            if (listswiper == null) {

               listswiper =  new ArrayList<SwiperPicture>();

            }



         } catch (Exception e) {

@@ -1633,12 +1655,6 @@


            if (listSpecial != null && listSpecial.size() > 0) {

               for (Special special : listSpecial) {

                  special.setCreatetime(null);

                  special.setUpdatetime(null);

                  special.setState(null);

                  special.setRemark(null);

                  special.setCard(null);

                  special.setCardId(null);



                  if ("限时秒杀".equals(special.getName())) {

                     miaoShaSpecial = special;

@@ -1652,6 +1668,7 @@
                     // 其他专题

                     specialList.add(special);

                  }

						
               }

            }



@@ -1685,10 +1702,40 @@
      }



      JSONObject root = new JSONObject();

      root.put("banner", listswiper);

      root.put("honest", honestList);

      root.put("special", specialList);

		
      root.put("banner", JsonUtil.getApiCommonGson().toJson(listswiper));

      root.put("honest", JsonUtil.getApiCommonGson().toJson(honestList));

      root.put("special", JsonUtil.getApiCommonGson().toJson(specialList));

      root.put("miaoSha", msJSON);

		


      // 增加邀请有奖

      JSONObject invite = new JSONObject();

      JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("invite");

      invite.put("jumpDetail", jumpDetail);

      invite.put("picture", "http://ec-1255749512.file.myqcloud.com/resource/weex/img/invite_input_img.png");



      if ("ios".equalsIgnoreCase(acceptData.getPlatform())

            && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {

         // 如果IOS当前版本处于审核状态就不返回

      } else {



         // 按照版本返回，版本覆盖足够后可删除

         if (("android".equalsIgnoreCase(acceptData.getPlatform()) && Integer.parseInt(acceptData.getVersion()) > 30)

               || ("ios".equalsIgnoreCase(acceptData.getPlatform())

                     && Integer.parseInt(acceptData.getVersion()) > 37)) {

            if (uid != null) {

               try {

                  UserSettingsVO vo = userCustomSettingsService.getMySettings(uid);

                  if (vo == null || vo.getNoInvitationBonus() == null || vo.getNoInvitationBonus() == 0)// 没有关闭邀请

                     root.put("invite", invite);

               } catch (UserCustomSettingsException e) {

                  e.printStackTrace();

               }

            } else

               root.put("invite", invite);

         }

      }



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



@@ -1700,10 +1747,11 @@
    * @param acceptData

    * @param id

    * @param uid

    * @param pageSource 页面来源

    * @param out

    */

   @RequestMapping(value = "getgoodsinfo", method = RequestMethod.POST)

   public void getGoodsInfo(AcceptData acceptData, String id, String uid, PrintWriter out) {

   public void getGoodsInfo(AcceptData acceptData, String id, String uid, String from, PrintWriter out) {



      if ("0".equalsIgnoreCase(uid)) {

         uid = "";

@@ -1798,7 +1846,7 @@
                  // 商品下架

                  ThreadUtil.run(new Runnable() {

                     public void run() {

                        taoBaoGoodsUpdateService.deleteTaoBaoGoods(Long.parseLong(id));

                        taoBaoGoodsUpdateService.offlineTaoBaoGoods(Long.parseLong(id));

                     }

                  });



@@ -1825,7 +1873,11 @@
               } catch (NumberFormatException e) {

                  e.printStackTrace();

               } catch (TaobaoGoodsDownException e) {

                  e.printStackTrace();

                  ThreadUtil.run(new Runnable() {

                     public void run() {

                        taoBaoGoodsUpdateService.offlineTaoBaoGoods(Long.parseLong(id));

                     }

                  });

               }



            }

@@ -1866,7 +1918,7 @@


      List<String> finalImgList = new ArrayList<>();

      for (String img : tb.getImgList()) {

         finalImgList.add(img);

         finalImgList.add(TbImgUtil.getTBSizeImg(img, 600));

      }



      JSONObject goods = new JSONObject();

@@ -1877,10 +1929,6 @@
      goods.put("price", tb.getReservePrice().toString());

      goods.put("zkPrice", tb.getZkPrice().toString());



      // 红包

      String rateStr = hongBaoManageService.get("hongbao_goods_proportion");

      String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, new BigDecimal(rateStr));

      goods.put("hongBao", hongBao);

      // 30天销量

      goods.put("saleCount", TaoBaoUtil.getSaleCount(tb.getBiz30day()));



@@ -1920,13 +1968,21 @@


      // 领券人列表

      List<ShamUser> listCouponUser = new ArrayList<ShamUser>();



		
      String hongBao = null;

		
      // 获取券信息

      if (!StringUtil.isNullOrEmpty(tb.getCouponInfo())) {

         BigDecimal quanPrice = TaoBaoUtil.getAfterUseCouplePrice(tb);

         JSONObject couponInfo = new JSONObject();

         couponInfo.put("couponPrice", quanPrice.toString());



			
         if (from != null && from.equals("miandan")) {

            // 免单商品

            hongBao = "¥" + quanPrice.toString();

         }

			
			
         // 服务端转链

         if (convertInServer && !StringUtil.isNullOrEmpty(tb.getCouponLink())) {

            couponInfo.put("couponUrl", tb.getCouponLink());

@@ -1945,7 +2001,14 @@
            listCouponUser = shamUserService.listRandCouponUser(5, 1, 300);

         }

      }



		
      // 红包

      if (hongBao == null) {

         BigDecimal proportion = manageService.getFanLiRate();

         hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);

      }

      goods.put("hongBao", hongBao);

		
      data.put("tbPidInfo", clientTBPid);



      String jumpUrl = "https://item.taobao.com/item.htm?id=" + tb.getAuctionId();

@@ -1979,11 +2042,33 @@
      // 分享路径

      String shareUrl = String.format("%s?id=" + tb.getAuctionId(), Constant.systemCommonConfig.getAppShareInfoUrl());



      // 是否加入选品库： 0未加入 1 已加入

      boolean storageState = false;

      if (uid != null && uid.trim().length() > 0) {

         storageState = userGoodsStorageService.isExistStorage(Long.parseLong(uid), Long.parseLong(id));

      }



      data.put("storageState", storageState);

      data.put("shareUrl", shareUrl);

      data.put("goods", goods);

      data.put("shareUsers", listShareUser);

      data.put("couponUsers", listCouponUser);

      data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);



		
//      取消分享活动

//      if (!StringUtil.isNullOrEmpty(uid)

//            && shareGoodsActivityOrderService.countShareGoodsActivityOrder(Long.parseLong(uid)) > 0) {

//      } else if(!"miandan".equals(from)) {

//         // 非免单商品

//         JSONObject shareActivity = new JSONObject();

//         shareActivity.put("moneyDesc", "春节狂欢奖金:¥" + TaoBaoUtil.getGoodsHongBaoMoney(tb,

//               new BigDecimal(hongBaoManageService.get("share_activity_proportion"))));

//         shareActivity.put("ruleDescPicture", "http://img.flqapp.com/resource/share_activity_img.png");

//			
//         data.put("shareActivity", shareActivity);

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



      final String tempUid = uid;

@@ -1991,16 +2076,10 @@
      ThreadUtil.run(new Runnable() {

         public void run() {

            // 添加浏览记录

            ScanHistory sh = TaoBaoUtil.getScanHistory(goodsInfo);

            sh.setId(0);

            sh.setDevice(acceptData.getDevice());

            sh.setSystem(systemService.getSystem(acceptData.getPlatform(), acceptData.getPackages()));

            sh.setCreatetime(new Date());

            if (!StringUtil.isNullOrEmpty(tempUid)) {

               sh.setUid(Long.parseLong(tempUid));

            }

            try {

               scanHistoryService.addScanHistory(sh);

               scanHistoryV2Service.addScanHistory(

                     StringUtil.isNullOrEmpty(tempUid) ? null : Long.parseLong(tempUid), acceptData.getDevice(),

                     goodsInfo);

            } catch (Exception e) {

               e.printStackTrace();

            }

@@ -2073,67 +2152,12 @@
      }



      List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.getRelationGoodsRecommend(id, 10);



      // 重新做推荐

      if (goodsList == null || goodsList.size() == 0) {



         goodsList = new ArrayList<>();



         TaoBaoGoodsBrief goods = null;



         try {

            goods = redisManager.getTaoBaoGoodsBrief(id);

         } catch (TaobaoGoodsDownException e) {

            e.printStackTrace();

         }



         if (goods == null) {

            // 从我们的商品库搜索

            CommonGoods cgoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(id,

                  CommonGoods.GOODS_TYPE_TB);

            // 商品有本地缓存

            if (cgoods != null) {

               // 按名字搜索商品

               SearchFilter sf = new SearchFilter();

               sf.setKey(cgoods.getTitle().substring(0, cgoods.getTitle().length() / 2));



               TaoBaoSearchResult result = TaoBaoUtil.search(sf);



               if (result != null && result.getTaoBaoGoodsBriefs() != null

                     && result.getTaoBaoGoodsBriefs().size() > 0) {



                  for (TaoBaoGoodsBrief gds : result.getTaoBaoGoodsBriefs()) {

                     if (goodsList.size() == 10) {

                        break;

                     }

                     goodsList.add(gds);

                  }

               }

            }

         }



         // 需要另做推荐

         if (goodsList.size() < 2) {

            try {

               List<RecommendSectionGoods> list = recommendSectionGoodsService.getSectionGoods(10);

               if (list != null) {

                  for (int i = 0; i < list.size(); i++) {

                     if (i == 10) {

                        break;

                     }

                     goodsList.add(list.get(i).getTaoBaoGoodsBrief());

                  }

               }

            } catch (Exception e2) {

               e2.printStackTrace();

            }



         }

      // 初始化

      if (goodsList == null) {

         goodsList = new ArrayList<TaoBaoGoodsBrief>();

      }



      Map<String, String> map = hongBaoManageService.convertMap();

      String proportion = map.get("hongbao_goods_proportion");

      String fcRate = map.get("hongbao_fc_ratio");

      BigDecimal proportion = manageService.getFanLiRate();



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



@@ -2147,7 +2171,7 @@
         }



         if (taoBaoGoodsBrief != null) {

            listExtra.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, ""));

            listExtra.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), ""));

         }



      });

@@ -2180,7 +2204,7 @@
                  taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));

               }



               listQuality.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null));

               listQuality.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null));

            }

         }

      } catch (Exception e2) {

@@ -2203,4 +2227,38 @@
      out.print(JsonUtil.loadTrueResult(data));

   }



   /**

    * 活动列表

    * 
    * @param acceptData

    * @param out

    */

   @RequestMapping(value = "getSpecialActivities")

   public void getSpecialActivities(AcceptData acceptData, Long uid, PrintWriter out) {



      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

      if (system == null) {

         out.print(JsonUtil.loadFalseResult(1, "系统不存在"));

         return;

      }



      try {

         // 专题活动

         String specialCard = "special_activities";



         List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE, specialCard,

               system.getId());



         if (listSpecial == null) {

            listSpecial = new ArrayList<Special>();

         }



         JSONObject root = new JSONObject();

         root.put("special", JsonUtil.getApiCommonGson().toJson(listSpecial));

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

			
      } catch (Exception e) {

         e.printStackTrace();

      }

   }

}