免单券退回时间 改为10分钟

yujian

2019-03-29 dc20bf7713654341d994d568bc0b55cfd5c23614

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

@@ -16,6 +16,7 @@
import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.IPUtil;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.NumberUtil;

@@ -32,13 +33,11 @@
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;

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

import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBanner;

import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBannerV2;

import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendSpecial;

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

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

@@ -117,8 +116,6 @@
@RequestMapping("api/v1/user")

public class RecommendController {



   @Resource

   private RecommendBannerService recommendService;



   @Resource

   private BusinessSystemService businessSystemService;

@@ -144,8 +141,6 @@
   @Resource

   private UserInfoService userInfoService;



   @Resource

   private TaoBaoOrderUtil taoBaoOrderUtil;



   @Resource

   private TaoBaoCouponService taoBaoCouponService;

@@ -158,9 +153,6 @@


   @Resource

   private CollectionGoodsV2Service collectionGoodsV2Service;



   @Resource

   private HongBaoManageMapper hongBaoManageMapper;



   @Resource

   private TaoBaoGoodsBriefService taoBaoGoodsBriefService;

@@ -404,25 +396,28 @@
      if (!"1".equals(version) && "android".equalsIgnoreCase(acceptData.getPlatform())) {

         jumpDetail = jumpDetailService.getlastJumpDetailCache();

      }

      List<RecommendSpecial> recommendSpecialList = null;



      List<SuperRecommendSpecial> superRecommendSpecialList = superRecommendSpecialService

            .getSuperRecommendSpecialBySystemId(system.getId());

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



      List<RecommendSpecial> recommendSpecialList = null;

      for (SuperRecommendSpecial superRecommendSpecial : superRecommendSpecialList) {

         if (recommendSpecialList == null) {

            recommendSpecialList = new ArrayList<RecommendSpecial>();

         recommendSpecialList = new ArrayList<RecommendSpecial>();



         for (SuperRecommendSpecial superRecommendSpecial : superRecommendSpecialList) {

            RecommendSpecial recommendSpecial = superRecommendSpecial.getRecommendSpecial();

            if (jumpDetail != null) {

               recommendSpecial.setJumpDetail(jumpDetail);

            }

            recommendSpecialList.add(recommendSpecial);

         }

         RecommendSpecial recommendSpecial = superRecommendSpecial.getRecommendSpecial();

         if (jumpDetail != null) {

            recommendSpecial.setJumpDetail(jumpDetail);

         }

         recommendSpecialList.add(recommendSpecial);

      }



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

         out.print(JsonUtil.loadFalseResult(1, "暂无数据"));

         return;

      }



      JSONObject data = new JSONObject();

      data.put("count", recommendSpecialList.size());

      Gson gson = new Gson();

@@ -1307,7 +1302,7 @@
               for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs()) {

                  if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && goods.getCouponAmount() != null

                        && goods.getCouponAmount().compareTo(new BigDecimal("5")) >= 0

                        && goods.getBiz30day() > 1000)

                        && goods.getBiz30day() > 1000 && !StringUtil.isNullOrEmpty(goods.getPictUrlWhite()))

                     goodsList.add(goods);

               }

               try {

@@ -1368,26 +1363,8 @@
      }



      // 首页Banner

      List<RecommendBannerV2> listBanner = null;



      List<SuperRecommendBannerV2> listRecommendBanner = superRecommendBannerV2Service

            .getSuperRecommendBannerV2sBySystem(system);



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



         listBanner = new ArrayList<RecommendBannerV2>();



         for (SuperRecommendBannerV2 superRecommendBanner : listRecommendBanner) {

            RecommendBannerV2 recommendBanner = superRecommendBanner.getRecommendBanner();

            // 淘特价暂时修改

            if (system.getId() == 7) {

               recommendBanner.getJumpDetail().setActivity(recommendBanner.getJumpDetail().getActivity()

                     .replace("com.yeshi.ec.rebate.myapplication", "com.yeshi.ec.taospecial"));

            }



            listBanner.add(recommendBanner);

         }

      }

      List<RecommendBannerV2> listBanner = superRecommendBannerV2Service

            .getSuperRecommendBannerV2sBySystem(system.getId());



      JSONObject root = new JSONObject();

      root.put("banner", listBanner);

@@ -1585,6 +1562,144 @@


   }



	
   /**

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

    * 
    * @param acceptData

    * @param out

    */

   @RequestMapping(value = "getRecommendIndex")

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



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

            acceptData.getPackages());

      if (system == null) {

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

         return;

      }



      // 轮播图

      List<SwiperPicture> swiperList = null;

      try {

         swiperList = swiperPictureService.getByBannerCard("weex_index");

      } catch (Exception e) {

         try {

            LogHelper.errorDetailInfo(e);

         } catch (Exception e1) {

            e1.printStackTrace();

         }

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



   }

	
	
   /**

    * 商品基本详情 (1.4.0)

    * 

@@ -1628,21 +1743,11 @@
      // 获取淘客参数

      ClientTBPid clientTBPid = null;



      if (StringUtil.isNullOrEmpty(uid)) {

         // 用户未登录

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

            clientTBPid = tbPidService.getAndroidDefault();

         } else {

            clientTBPid = tbPidService.getIOSDefault();

         }



      // 用户未登录

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

         clientTBPid = tbPidService.getAndroidDefault();

      } else {

         // 用户已经登录

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

            clientTBPid = tbPidService.getAndroidDefault();

         } else {

            clientTBPid = tbPidService.getIOSDefault();

         }

         clientTBPid = tbPidService.getIOSDefault();

      }



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

@@ -1665,6 +1770,21 @@


               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() {

@@ -1691,6 +1811,15 @@
                     // 测试使用

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

@@ -1808,7 +1937,7 @@


         String token = "";

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

             token = redisManager.getCommonTaoToken(tb.getAuctionId());

            token = redisManager.getCommonTaoToken(tb.getAuctionId());

            if (StringUtil.isNullOrEmpty(token)) {

               token = TaoKeApiUtil.getTKToken(tb.getPictUrl(), tb.getTitle(), tb.getCouponLink());

               redisManager.saveCommonTaoToken(tb.getAuctionId(), token);

@@ -1891,8 +2020,13 @@
      data.put("couponUsers", listCouponUser);

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

      // 商品链接

      data.put("h5Url", String.format("http://%s%s?id=%s&appType=flq", configService.getH5Host(),

            Constant.systemCommonConfig.getShareGoodsPagePath(), tb.getAuctionId() + ""));

      String h5Url = String.format("http://%s%s?id=%s&appType=flq", configService.getH5Host(),

            Constant.systemCommonConfig.getShareGoodsPagePath(), tb.getAuctionId() + "");

      try {

         data.put("h5Url", HttpUtil.getShortLink(h5Url));

      } catch (Exception e) {

         data.put("h5Url", h5Url);

      }



      // 取消分享活动

      // if (!StringUtil.isNullOrEmpty(uid)

@@ -2021,40 +2155,43 @@
      });



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

//删除推荐

//

//      try {

//         List<QualityFactory> listRecommend = qualityGoodsService.recommendByAuctionId(id);

//

//         if (listRecommend != null && listRecommend.size() > 1) {

//            for (QualityFactory quality : listRecommend) {

//

//               TaoBaoGoodsBrief taoBaoGoodsBrief = quality.getTaoBaoGoodsBrief();

//               if (taoBaoGoodsBrief == null) {

//                  continue;

//               }

//

//               int biz30day = taoBaoGoodsBrief.getBiz30day();

//               if (biz30day >= 10000) {

//                  double sales = biz30day;

//                  String salesCountMidea = String.format("%.1f", sales / 10000);

//                  taoBaoGoodsBrief.setSalesCount(salesCountMidea + "万");

//               } else {

//                  taoBaoGoodsBrief.setSalesCount(biz30day + "");

//               }

//

//               // 改变图片尺寸

//               String pictUrl = taoBaoGoodsBrief.getPictUrl();

//               if (!StringUtil.isNullOrEmpty(pictUrl) && !pictUrl.contains("320x320")) {

//                  taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));

//               }

//

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

//            }

//         }

//      } catch (Exception e2) {

//         e2.printStackTrace();

//      }

      // 删除推荐

      //

      // try {

      // List<QualityFactory> listRecommend =

      // qualityGoodsService.recommendByAuctionId(id);

      //

      // if (listRecommend != null && listRecommend.size() > 1) {

      // for (QualityFactory quality : listRecommend) {

      //

      // TaoBaoGoodsBrief taoBaoGoodsBrief = quality.getTaoBaoGoodsBrief();

      // if (taoBaoGoodsBrief == null) {

      // continue;

      // }

      //

      // int biz30day = taoBaoGoodsBrief.getBiz30day();

      // if (biz30day >= 10000) {

      // double sales = biz30day;

      // String salesCountMidea = String.format("%.1f", sales / 10000);

      // taoBaoGoodsBrief.setSalesCount(salesCountMidea + "万");

      // } else {

      // taoBaoGoodsBrief.setSalesCount(biz30day + "");

      // }

      //

      // // 改变图片尺寸

      // String pictUrl = taoBaoGoodsBrief.getPictUrl();

      // if (!StringUtil.isNullOrEmpty(pictUrl) &&

      // !pictUrl.contains("320x320")) {

      // taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));

      // }

      //

      // listQuality.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,

      // proportion.toString(), null));

      // }

      // }

      // } catch (Exception e2) {

      // e2.printStackTrace();

      // }



      // 取偶数个数据

      if (listExtra.size() % 2 != 0) {

@@ -2066,8 +2203,8 @@
      }



      JSONObject data = new JSONObject();

      data.put("listGuess", JsonUtil.getApiCommonGson().toJson(listExtra));

      data.put("listQuality", JsonUtil.getApiCommonGson().toJson(listQuality));

      data.put("listQuality", JsonUtil.getApiCommonGson().toJson(listExtra));

      data.put("listGuess", JsonUtil.getApiCommonGson().toJson(listQuality));



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

   }