Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-07-30 dadacf7c1065876248bec86cf17c06ca4be1b97c

 fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java

@@ -37,7 +37,7 @@


   @Resource

   private TLJBuyGoodsService tljBuyGoodsService;



	
   @Resource

   private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;



@@ -99,9 +99,9 @@
   }



   /**

    * 每天凌晨过3分钟验证

    * 每天凌晨5点过10分钟验证

    */

   @Scheduled(cron = "0 3 0 * * ?")

   @Scheduled(cron = "0 10 5 * * ? ")

   public void updateBuyTLJGoods() {

      if (!Constant.IS_TASK)

         return;

@@ -112,9 +112,11 @@
      for (int i = 0; i < list.size(); i++) {

         if (count >= 10)

            break;

         boolean success = tljBuyGoodsService.verifyCanCreateTLJ(list.get(i).getGoods().getAuctionId());

         boolean success = shareHotGoodsService.verifyCanCreateTLJ(list.get(i).getGoods().getAuctionId(),

               new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET,

                     TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT));

         if (success) {

            count++;

            count++;
         }

      }

   }

@@ -138,7 +140,7 @@
               tljBuyGoodsService.addTLJBuyGoods(

                     new TLJBuyGoods(null, day, new Date(), goods, totalHongBaoCount, leftHongBaoCount),

                     TaoBaoConstant.ownBuyApp);

            }

            }
         }

      }

   }

@@ -153,7 +155,7 @@
      String day = TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd");

      List<TaoBaoGoodsBrief> list = tljBuyGoodsService.listPreGoods(1);

      Collections.shuffle(list);

      if (list.size() > 20)

      if (list.size() > 0)

         list = list.subList(0, 1);

      addTLJBuyGoods(list, day);

   }

@@ -169,7 +171,7 @@
      List<TaoBaoGoodsBrief> list = tljBuyGoodsService.listPreGoods(1);

      Collections.shuffle(list);

      if (list.size() > 20)

         list = list.subList(0, 1);

         list = list.subList(0, 20);

      addTLJBuyGoods(list, day);

   }