京东订单修改

admin

2019-08-26 5a80c35e42ba1ed7340097ea9b156016e52a23f2

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java

@@ -21,12 +21,12 @@
import com.yeshi.fanli.dto.pdd.PDDGoodsResult;

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

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

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

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

import com.yeshi.fanli.entity.jd.JDGoods;

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

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

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

import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;

import com.yeshi.fanli.log.LogHelper;

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

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

@@ -43,14 +43,17 @@
import com.yeshi.fanli.service.inter.pdd.PDDGoodsService;

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

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;

import com.yeshi.fanli.tag.PageEntity;

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

import com.yeshi.fanli.util.VersionUtil;

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

import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;

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

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

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

import com.yeshi.fanli.vo.goods.GoodsDetailVO;

@@ -113,6 +116,9 @@
   @Resource

   private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;



   @Resource

   private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;



   /**

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

    * 

@@ -129,10 +135,16 @@
         JSONObject root = specialService.listCacheSpecialToIndex(acceptData, deviceSex);



         // 2、顶部轮播图

         List<SwiperPicture> topPicList = swiperPictureService.getByBannerCard("index_top");

         if (topPicList == null) {

            topPicList = new ArrayList<SwiperPicture>();

         List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCard("index_top");

         List<SwiperPicture> topPicList = new ArrayList<>();

         if (oldtopPicList != null && oldtopPicList.size() > 0)

            topPicList.addAll(oldtopPicList);

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

            SwiperPicture notifyReName = swiperPictureService.selectByPrimaryKey(162L);

            if (notifyReName != null)

               topPicList.add(0, notifyReName);

         }



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



         // 3、邀请有奖

@@ -181,44 +193,33 @@
   }



   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;

      List<String> dtoList =  DaTaoKeUtil.getDingDongQiangTime();

      long nowTime = System.currentTimeMillis();

      int dateNum = Integer.parseInt(TimeUtil.getGernalTime(nowTime, "ddHH"));

      String timeStr = null;

      int nextPos = 0;

      for (int i = 0; i < dtoList.size() - 1; i++) {

         if (dateNum >= Integer.parseInt(dtoList.get(i)) && dateNum < Integer.parseInt(dtoList.get(i + 1))) {

            timeStr = dtoList.get(i);

            nextPos = i + 1;

            break;

         }

      }

      if (timeStr == null)

         timeStr = dtoList.get(dtoList.size() - 1);



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

      long nextTime = nowTime + 1000 * 60 * 60L;// 默认为1小时

      if (nextPos < dtoList.size()) {

         nextTime = TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(nowTime, "yyyyMM") + dtoList.get(nextPos),

               "yyyyMMddHH");

      }



      JSONArray array = null;

      String timekey = String.format("spikeGoods_hour_new-%s-%s", acceptData.getPlatform(), acceptData.getVersion());

      String cachekey = String.format("spikeGoodsList_new-%s-%s", acceptData.getPlatform(), acceptData.getVersion());

      Calendar nowCalendar = Calendar.getInstance();

      nowCalendar.setTimeInMillis(nowTime);

      int hour = nowCalendar.get(Calendar.HOUR_OF_DAY);



      String timeValue = redisManager.getCommonString(timekey);

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

@@ -229,6 +230,7 @@
            array = JSONArray.fromObject(cacheValue);

         }

      }



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

      if (array == null) {

         array = new JSONArray();

@@ -240,15 +242,18 @@
               .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();



         // 缓存中不存在

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

         List<DaTaoKeDetailV2> listGoods = daTaoKeGoodsDetailV2Service.getDingDongQiangData(timeStr);

         if (listGoods == null) {

            listGoods = new ArrayList<QualityFactory>();

            listGoods = new ArrayList<>();

         }



         if (listGoods != null && listGoods.size() > 3)

            listGoods = listGoods.subList(0, 3);



         /* 遍历列表数据 */



         for (QualityFactory qualityFactory : listGoods) {

            TaoBaoGoodsBrief taoBaoGoodsBrief = qualityFactory.getTaoBaoGoodsBrief();

         for (DaTaoKeDetailV2 detail : listGoods) {

            TaoBaoGoodsBrief taoBaoGoodsBrief = TaoBaoUtil.convert(detail);

            if (taoBaoGoodsBrief == null) {

               continue;

            }

@@ -274,10 +279,13 @@
         // 缓存半个小时

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

      }

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



      // 获取今天的数据



      Long endTime = nextTime - nowTime;



      JSONObject root = new JSONObject();

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

      root.put("time", nextTime);

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

      root.put("listgoods", array);