增加动态用户

admin

2019-05-16 4114e871bcb3dce771b6aed64a1027d0bbb95ca6

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

@@ -8,7 +8,6 @@
import java.util.Collections;

import java.util.Date;

import java.util.List;

import java.util.Map;



import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;

@@ -28,11 +27,11 @@
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;

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

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

import com.yeshi.fanli.entity.bus.lable.QualityFactory;

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

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

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

@@ -53,15 +52,16 @@
import com.yeshi.fanli.entity.taobao.ClientTBPid;

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

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

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

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

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

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

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

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

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

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

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

@@ -74,7 +74,6 @@
import com.yeshi.fanli.service.inter.config.SystemConfigService;

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

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

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

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

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

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

@@ -85,11 +84,13 @@
import com.yeshi.fanli.service.inter.homemodule.SuperSpecialService;

import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;

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

import com.yeshi.fanli.service.inter.lable.QualityFlashSaleService;

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

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

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

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

@@ -100,13 +101,15 @@
import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TaoBaoConstant;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;

import com.yeshi.fanli.util.factory.MonitorFactory;

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

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.msg.ClientTextStyleVO;

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



import net.sf.json.JSONArray;

@@ -115,7 +118,6 @@
@Controller

@RequestMapping("api/v1/user")

public class RecommendController {





   @Resource

   private BusinessSystemService businessSystemService;

@@ -140,7 +142,6 @@


   @Resource

   private UserInfoService userInfoService;





   @Resource

   private TaoBaoCouponService taoBaoCouponService;

@@ -214,10 +215,17 @@
   @Resource

   private UserInfoExtraService userInfoExtraService;



   @Resource

   private QualityFlashSaleService qualityFlashSaleService;



   @Resource

   private TaoBaoGoodsCacheUtil taoBaoGoodsCacheUtil;



   @Resource

   private TaoBaoShopService taoBaoShopService;



   @RequestMapping(value = "getHonestList")

   public void getHonestList(AcceptData acceptData, PrintWriter out) {

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

            acceptData.getPackages());

      List<Honest> honestList = null;

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

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

@@ -564,8 +572,8 @@
      // 获取淘客参数

      ClientTBPid clientTBPid = null;

      if (simpleGoods.getMaterialLibType() != null && simpleGoods.getMaterialLibType() == 1) {

         String pid = Constant.TAOBAO_SPECIAL_PID_DEFAULT;

         clientTBPid = new ClientTBPid(Constant.TAOBAO_AUTH_APPKEY, Constant.TAOBAO_AUTH_APPSECRET,

         String pid = TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT;

         clientTBPid = new ClientTBPid(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET,

               pid.split("_")[2], pid.split("_")[3]);

      } else {

         if (acceptData.getPlatform().equalsIgnoreCase("android")) {

@@ -966,7 +974,6 @@
      ClientTBPid clientTBPid = null;

      // 用户已经登录

      if (!StringUtil.isNullOrEmpty(uid)) {

         TBPid tbPid = null;

         if (acceptData.getPlatform().equalsIgnoreCase("android")) {

            clientTBPid = tbPidService.getAndroidDefault();

         } else {

@@ -1288,7 +1295,6 @@
      // 从推荐来

      if (page <= 1) {

         array.clear();

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

         BigDecimal proportion = manageService.getFanLiRate();

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

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

@@ -1330,14 +1336,12 @@
               proportion.toString());

         array.addAll(localArray);

      } else {// 从精选库来

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

         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.toString());

      }



      JSONObject data = new JSONObject();

@@ -1557,12 +1561,9 @@
               root.put("invite", invite);

         }

      }



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



   }



	
   /**

    * 新版推荐专题管理(1.5.3)

    * 

@@ -1571,18 +1572,73 @@
    */

   @RequestMapping(value = "getRecommendIndex")

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

      try {

         // 1、专题模块

         JSONObject root = specialService.listCacheSpecialToIndex(acceptData);



      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

            acceptData.getPackages());

      if (system == null) {

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

         return;

         // 2、顶部轮播图

         List<SwiperPicture> topPicList = getSwiperByCard("index_top");

         if (topPicList == null) {

            topPicList = new ArrayList<SwiperPicture>();

         }

         root.put("topPicList", JsonUtil.getApiCommonGson().toJson(topPicList));



         // 3、邀请有奖

         List<SwiperPicture> invitePicList = null;

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

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

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

         } else {

            invitePicList = getSwiperByCard("index_invite");

         }



         if (invitePicList == null) {

            invitePicList = new ArrayList<SwiperPicture>();

         }

         root.put("invitePicList", JsonUtil.getApiCommonGson().toJson(invitePicList));



         // 4、IOS的底部网页链接

         String platform = acceptData.getPlatform();

         if ("ios".equalsIgnoreCase(platform)) {

            root.put("htmlLink", configService.get("index_html_link_ios"));

         }

			
         root.put("spikeGoods",  getSpikeGoodsContent(acceptData));



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

      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult(1, "获取数据失败"));

         try {

            LogHelper.errorDetailInfo(e);

         } catch (Exception e1) {

            e1.printStackTrace();

         }

      }

   }



   /**

    * 邀请有奖是否需要返回

    * 
    * @param uid

    * @param acceptData

    * @return

    */

   public List<SwiperPicture> getInvitePicList(Long uid, AcceptData acceptData) {

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

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

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

         return null;

      }



      // 轮播图

      List<SwiperPicture> invitePicList = getSwiperByCard("index_invite");



      return invitePicList;

   }



   public List<SwiperPicture> getSwiperByCard(String card) {

      List<SwiperPicture> swiperList = null;

      try {

         swiperList = swiperPictureService.getByBannerCard("weex_index");

         swiperList = swiperPictureService.getByBannerCard(card);

      } catch (Exception e) {

         try {

            LogHelper.errorDetailInfo(e);

@@ -1591,115 +1647,114 @@
         }

         e.printStackTrace();

      }



      if (swiperList == null) {

         swiperList = new ArrayList<SwiperPicture>();

      }

		
		
      Special miaoShaSpecial = null;

      // 两行圆形专题

      List<Special> arcList = new ArrayList<Special>();

		
      // 活动列表

      List<Special> activityList = new ArrayList<Special>();

		
      // 方块部分

      List<Special> blockList = new ArrayList<Special>();

		
		
      try {

         List<Special> listSpecial = specialService.listBySystemAndCard("index", system.getId());



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

            for (Special special : listSpecial) {



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

                  miaoShaSpecial = special;

                  continue;

               }



               if (Special.SHOWTYPE_ARC.equals(special.getShowType())) {

                  // 两行圆形专题

                  arcList.add(special);

               } else if (Special.SHOWTYPE_BLOCK.equals(special.getShowType())) {

                  // 方块部分

                  blockList.add(special);

               } else if (Special.SHOWTYPE_ACTIVITY.equals(special.getShowType())) {

                  // 动态

                  activityList.add(special);

               }

            }

         }



      } catch (Exception e) {

         e.printStackTrace();

      }





      /* 限时秒杀 - 时间处理 */

      JSONObject msJSON = JSONObject.fromObject(new Gson().toJson(miaoShaSpecial));

      if (miaoShaSpecial != null) {

         // 获取秒杀

         int[] hours = new int[] { 0, 9, 12, 14, 16, 20, 22 };

         int hour = -1;

         Calendar calendar = Calendar.getInstance();

         calendar.setTimeInMillis(Long.parseLong(acceptData.getTime()));

         int nowHour = calendar.get(Calendar.HOUR_OF_DAY);

         for (int i = 0; i < hours.length - 1; i++) {

            if (nowHour >= hours[i] && nowHour < hours[i + 1]) {

               hour = hours[i + 1];

               break;

            }

         }



         if (hour < 0)

            hour = 24;

         long time = TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(calendar.getTimeInMillis(), "yyyy-MM-dd"),

               "yyyy-MM-dd") + 1000 * 60 * 60 * hour;

         msJSON.put("time", time);

      }



      JSONObject root = new JSONObject();

      root.put("swiperList", JsonUtil.getApiCommonGson().toJson(swiperList));

      root.put("arcList", JsonUtil.getApiCommonGson().toJson(arcList));

      root.put("activityList", JsonUtil.getApiCommonGson().toJson(activityList));

      root.put("blockList", JsonUtil.getApiCommonGson().toJson(blockList));

      root.put("miaoSha", msJSON);



      // 增加邀请有奖

      JSONObject invite = new JSONObject();

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

      invite.put("jumpDetail", jumpDetail);

      invite.put("picture", configService.get("home_invite_banner"));



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



      return swiperList;

   }

	
	


   private JSONObject getSpikeGoodsContent(AcceptData acceptData) {

      // 下一次倒计时的时间

      int type = qualityFlashSaleService.getNowType() + 1;

      int hour = 0;

      switch (type) {

      case 1:

         hour = 0;

         break;

      case 2:

         hour = 9;

         break;

      case 3:

         hour = 12;

         break;

      case 4:

         hour = 14;

         break;

      case 5:

         hour = 16;

         break;

      case 6:

         hour = 20;

         break;

      case 7:

         hour = 22;

         break;

      default:

         break;

      }



      Calendar nextTime = Calendar.getInstance();

      nextTime.set(Calendar.HOUR_OF_DAY, hour);

      nextTime.set(Calendar.MINUTE, 0);

      nextTime.set(Calendar.SECOND, 0);

      nextTime.set(Calendar.MILLISECOND, 0);



      JSONArray array = null;

      String timekey = "spikeGoods_hour";

      String cachekey = "spikeGoodsList";



      String timeValue = redisManager.getCommonString(timekey);

      if (timeValue == null || !timeValue.equals(hour + "")) {

         redisManager.cacheCommonString(timekey, hour + "", 60 * 30);

      } else {

         String cacheValue = redisManager.getCommonString(cachekey);

         if (!StringUtil.isNullOrEmpty(cacheValue)) {

            array = JSONArray.fromObject(cacheValue);

         }

      }



      if (array == null) {

         array = new JSONArray();



         BigDecimal proportion = manageService.getFanLiRate();

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

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



         // 缓存中不存在

         List<QualityFactory> listGoods = qualityGoodsService.listFlashSaleRandGoods();

         if (listGoods == null) {

            listGoods = new ArrayList<QualityFactory>();

         }



         /* 遍历列表数据 */

         for (QualityFactory qualityFactory : listGoods) {



            TaoBaoGoodsBrief taoBaoGoodsBrief = qualityFactory.getTaoBaoGoodsBrief();

            if (taoBaoGoodsBrief == null) {

               continue;

            }

            array.add(gson

                  .toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));

         }



         // 缓存半个小时

         redisManager.cacheCommonString(cachekey, array.toString(), 60 * 30);

      }

      Long endTime = nextTime.getTimeInMillis() - java.lang.System.currentTimeMillis();

		
      JSONObject root = new JSONObject();

      root.put("time", nextTime.getTimeInMillis());

      root.put("endTime", endTime > 0? endTime : 0);

      root.put("listgoods", array);



      return root;

   }



   /**

    * 限时秒杀 1.5.3

    * 
    * @param acceptData

    * @param out

    */

   @RequestMapping(value = "getSpikeGoods")

   public void getSpikeGoods(AcceptData acceptData, PrintWriter out) {

      JSONObject params = new JSONObject();

      params.put("url", configService.get("spike_goods_link"));

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

		
      JSONObject root = getSpikeGoodsContent(acceptData);

      root.put("params", params);

      root.put("jumpDetail", jumpDetail);

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

   }



   /**

    * 商品基本详情 (1.4.0)

    * 

@@ -1752,110 +1807,102 @@


      LogHelper.test("获取PID耗时：" + (java.lang.System.currentTimeMillis() - startTime));



      final String clientPid = clientTBPid.getPid();

      final List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();

      // 是否在服务端进行转链

      boolean convertInServer = configService.isConvertTaoBaoLinkInServer();



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

      // 获取商品基本信息

      taskList.add("goods");

      JSONObject ticket = new JSONObject();

      TaoBaoGoodsBrief goods = null;



      taskList.stream().parallel().forEach(task -> {

         if (task.equalsIgnoreCase("goods")) {

            JSONObject ticket = new JSONObject();

            TaoBaoGoodsBrief goods = null;



            if (!convertInServer) {



               try {

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

                  if (goods.getTkRate() == null || new BigDecimal(0).compareTo(goods.getTkRate()) == 0) {

                     String appId = clientPid.split("_")[2];

                     TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(appId);

                     TaoKeAppInfo app = new TaoKeAppInfo();

                     app.setAdzoneId(clientPid.split("_")[3]);

                     app.setAppKey(config.getAppKey());

                     app.setAppSecret(config.getAppSecret());

                     app.setPid(clientPid);

                     TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app);

                     if (linkInfo != null) {

                        goods.setAuctionUrl(linkInfo.getAuctionUrl());

                        goods.setCouponLink(linkInfo.getCouponLink());

                        goods.setTkRate(linkInfo.getTkRate());

                     }

                  }

               } catch (TaobaoGoodsDownException e) {

                  // 商品下架

                  ThreadUtil.run(new Runnable() {

                     public void run() {

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

                     }

                  });



               }



            } else {

               String appId = clientPid.split("_")[2];

               TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(appId);

      if (!convertInServer) {

         try {

            goods = taoBaoGoodsCacheUtil.getCommonTaoBaoGoodsInfo(Long.parseLong(id));

            if (goods == null) {

               TaoKeAppInfo app = new TaoKeAppInfo();

               app.setAdzoneId(clientPid.split("_")[3]);

               app.setAppKey(config.getAppKey());

               app.setAppSecret(config.getAppSecret());

               app.setPid(clientPid);



               try {

                  goods = TaoKeApiUtil.searchGoodsDetail(Long.parseLong(id), app);

                  if (goods != null) {

                     ticket.put("clickUrl", goods.getAuctionUrl());

                     // 测试使用

                     ticket.put("couponUrl", goods.getCouponLink());

                     data.put("ticket", ticket);

                  }



                  if (goods.getTkRate() == null || new BigDecimal(0).compareTo(goods.getTkRate()) == 0) {

                     TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app);

                     if (linkInfo != null) {

                        goods.setAuctionUrl(linkInfo.getAuctionUrl());

                        goods.setCouponLink(linkInfo.getCouponLink());

                        goods.setTkRate(linkInfo.getTkRate());

                     }

                  }



               } catch (NumberFormatException e) {

                  e.printStackTrace();

               } catch (TaobaoGoodsDownException e) {

               app.setAppKey(TaoBaoConstant.TAOBAO_COMMON_APPKEY);

               app.setAppSecret(TaoBaoConstant.TAOBAO_COMMON_APPSECRET);

               app.setPid(TaoBaoConstant.TAOBAO_COMMON_PID);

               app.setAdzoneId(TaoBaoConstant.TAOBAO_COMMON_PID.split("_")[3]);

               goods = TaoKeApiUtil.searchGoodsDetail(Long.parseLong(id), app);

               final TaoBaoGoodsBrief finalGoods = goods;

               if (goods != null) {

                  ThreadUtil.run(new Runnable() {

                     @Override

                     public void run() {

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

                        taoBaoGoodsCacheUtil.saveCommonTaoBaoGoodsInfo(finalGoods);

                     }

                  });

               }



            }

         } catch (TaobaoGoodsDownException e) {

            // 商品下架

            ThreadUtil.run(new Runnable() {

               public void run() {

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

               }

            });



            if (goods != null) {

               goodsList.add(goods);

               final TaoBaoGoodsBrief newGoods = goods;

               ThreadUtil.run(new Runnable() {

                  public void run() {

                     try {

                        // 更新商品

                        LogHelper.test("更新商品详情:" + newGoods.getAuctionId());

                        taoBaoGoodsUpdateService.updateTaoBaoGoods(newGoods);

                     } catch (TaobaoGoodsUpdateException e) {



                     }

                  }

               });

            }

         }

      });



      } else {

         final String clientPid = clientTBPid.getPid();

         String appId = clientPid.split("_")[2];

         TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(appId);

         TaoKeAppInfo app = new TaoKeAppInfo();

         app.setAdzoneId(clientPid.split("_")[3]);

         app.setAppKey(config.getAppKey());

         app.setAppSecret(config.getAppSecret());

         app.setPid(clientPid);



         try {

            goods = TaoKeApiUtil.searchGoodsDetail(Long.parseLong(id), app);

            if (goods != null) {

               ticket.put("clickUrl", goods.getAuctionUrl());

               // 测试使用

               ticket.put("couponUrl", goods.getCouponLink());

               data.put("ticket", ticket);

            }



            if (goods.getTkRate() == null || new BigDecimal(0).compareTo(goods.getTkRate()) == 0) {

               TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app);

               if (linkInfo != null) {

                  goods.setAuctionUrl(linkInfo.getAuctionUrl());

                  goods.setCouponLink(linkInfo.getCouponLink());

                  goods.setTkRate(linkInfo.getTkRate());

               }

            }



         } catch (NumberFormatException e) {

            e.printStackTrace();

         } catch (TaobaoGoodsDownException e) {

            ThreadUtil.run(new Runnable() {

               public void run() {

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

               }

            });

         }



      }



      if (goods != null) {

         goodsList.add(goods);

         final TaoBaoGoodsBrief newGoods = goods;

         ThreadUtil.run(new Runnable() {

            public void run() {

               try {

                  // 更新商品

                  LogHelper.test("更新商品详情:" + newGoods.getAuctionId());

                  taoBaoGoodsUpdateService.updateTaoBaoGoods(newGoods);

               } catch (TaobaoGoodsUpdateException e) {



               }

            }

         });

      }



      TaoBaoGoodsBrief tb = null;

      if (goodsList.size() > 0) {

         tb = goodsList.get(0);



      }



      if (tb == null) {

@@ -1873,18 +1920,22 @@
      for (String img : tb.getImgList()) {

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

      }

      if (!StringUtil.isNullOrEmpty(tb.getPictUrlWhite()))

         finalImgList.add(0, tb.getPictUrlWhite());



      JSONObject goods = new JSONObject();

      goods.put("auctionId", tb.getAuctionId());

      goods.put("imgList", finalImgList);

      goods.put("title", tb.getTitle());

      goods.put("userType", tb.getUserType() == 1 ? 2 : 1);

      goods.put("price", tb.getReservePrice().toString());

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

      JSONObject goodsJson = new JSONObject();

      goodsJson.put("auctionId", tb.getAuctionId());

      goodsJson.put("imgList", finalImgList);

      goodsJson.put("title", tb.getTitle());

      goodsJson.put("userType", tb.getUserType() == 1 ? 2 : 1);

      goodsJson.put("price", tb.getReservePrice().toString());

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



		
      // 30天销量

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



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

      goodsJson.put("salesCount", TaoBaoUtil.getSaleCount(tb.getBiz30day()));

		
      // 分享赚

      BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb);

      data.put("shareMoney", "¥" + shareMoney);

@@ -1917,7 +1968,7 @@
      LogHelper.test(String.format("PID: uid-%s  pid-%s", uid + "", pid));



      // 是否有券

      goods.put("coupon", StringUtil.isNullOrEmpty(tb.getCouponInfo()) ? false : true);

      goodsJson.put("coupon", StringUtil.isNullOrEmpty(tb.getCouponInfo()) ? false : true);



      // 领券人列表

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

@@ -1946,19 +1997,21 @@
         tb.setCouponLinkTaoToken(token);



         // 服务端转链

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

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

         } else {

            couponInfo.put("couponUrl",

                  TaoBaoCouponUtil.getCoupleUrl(tb.getCouponActivityId() + "", pid, tb.getAuctionId() + ""));

         }

         // if (convertInServer &&

         // !StringUtil.isNullOrEmpty(tb.getCouponLink())) {

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

         // } else {

         // couponInfo.put("couponUrl",

         // TaoBaoCouponUtil.getCoupleUrl(tb.getCouponActivityId() + "", pid,

         // tb.getAuctionId() + ""));

         // }



         couponInfo.put("couponAmount", NumberUtil.subZeroAndDot(tb.getCouponAmount().toString()));

         couponInfo.put("couponTime", "使用期限：" + tb.getCouponEffectiveStartTime().replace("-", ".") + "-"

               + tb.getCouponEffectiveEndTime().replace("-", "."));

         // 券的口令

         couponInfo.put("couponToken", token);

         goods.put("couponInfo", couponInfo);

         goodsJson.put("couponInfo", couponInfo);



         if (tb.getBiz30day() >= 1000) {

            // 领券人列表

@@ -1971,7 +2024,12 @@
         BigDecimal proportion = manageService.getFanLiRate();

         hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);

      }

      goods.put("hongBao", hongBao);

      goodsJson.put("hongBao", hongBao);



      List<ClientTextStyleVO> labels = new ArrayList<>();

      labels.add(new ClientTextStyleVO("标签内容", "#F14242"));

      labels.add(new ClientTextStyleVO("标签内容", "#00FF00"));

      goodsJson.put("labels", labels);



      data.put("tbPidInfo", clientTBPid);



@@ -1989,7 +2047,7 @@
         else

            jumpUrl = tb.getAuctionUrl();

      }

      goods.put("jumpUrl", jumpUrl);

      goodsJson.put("jumpUrl", jumpUrl);



      TaoBaoShopInfo tbShopInfo = redisManager.getTBShopInfo(tb.getShopTitle(), tb.getSellerId(), tb.getAuctionId());

      if (tbShopInfo != null) {

@@ -2001,7 +2059,17 @@
         }

      }

      // 店铺

      goods.put("shopInfo", tbShopInfo);

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

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

                  && Integer.parseInt(acceptData.getVersion()) >= 49)) {

         TaoBaoShop shop = taoBaoShopService.getTaoBaoShop(goods.getAuctionId(), goods.getSellerId());

         if (shop != null)

            goodsJson.put("shopInfo", shop);

      } else {

         goodsJson.put("shopInfo", tbShopInfo);

      }



      goodsJson.put("fanliValid",Math.random()>0.5? true:false);// 是否有返利



      // 分享路径

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

@@ -2015,7 +2083,7 @@
      data.put("storageState", storageState);

      data.put("shareUrl", shareUrl);



      data.put("goods", goods);

      data.put("goods", goodsJson);

      data.put("shareUsers", listShareUser);

      data.put("couponUsers", listCouponUser);

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

@@ -2139,20 +2207,48 @@


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



      goodsList.parallelStream().forEach(goods -> {

         // 获取详情

         TaoBaoGoodsBrief taoBaoGoodsBrief = null;

         try {

            taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(goods.getAuctionId());

         } catch (Exception e) {

            e.printStackTrace();

         }

      TaoKeAppInfo app = new TaoKeAppInfo();

      app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY);

      app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);

      app.setAdzoneId(TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT.split("_")[3]);

      app.setPid(TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT);



         if (taoBaoGoodsBrief != null) {

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

         }

      List<Long> ids = new ArrayList<>();

      for (TaoBaoGoodsBrief goods : goodsList)

         ids.add(goods.getAuctionId());



      });

      try {

         goodsList = TaoKeApiUtil.getBatchGoodsInfo(ids);

      } catch (TaoKeApiException e1) {

         e1.printStackTrace();

      } catch (TaobaoGoodsDownException e1) {

         e1.printStackTrace();

      }



      if (goodsList != null)

         goodsList.parallelStream().forEach(goods -> {



            // 获取详情

            TaoBaoGoodsBrief taoBaoGoodsBrief = null;

            try {

               taoBaoGoodsBrief = taoBaoGoodsCacheUtil.getCommonTaoBaoGoodsInfo(goods.getAuctionId());

            } catch (Exception e) {

               e.printStackTrace();

            }



            if (taoBaoGoodsBrief == null) {

               TaoBaoGoodsBrief newGoods = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app);

               goods.setCouponInfo(newGoods.getCouponInfo());

               goods.setCouponLink(newGoods.getCouponLink());

               goods.setTkRate(newGoods.getTkRate());

               taoBaoGoodsBrief = goods;

            }



            if (taoBaoGoodsBrief != null) {

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

            }



         });



      List<TaoBaoGoodsBrief> listQuality = new ArrayList<TaoBaoGoodsBrief>();

      // 删除推荐