yujian
2019-07-19 4c31405418bdd063605f1e5821d99f85be02f23c
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailV2ServiceImpl.java
@@ -2,6 +2,7 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
@@ -225,13 +226,29 @@
   @Override
   public List<DaTaoKeDetailV2> listPreTLJBuyGoods(int page) {
      if (page == 1) {
         DaTaoKeGoodsResult result = DaTaoKeApiUtil.getRankingList(DaTaoKeApiUtil.RANK_TYPE_DAY, null);
         DaTaoKeGoodsResult result = DaTaoKeApiUtil.getRankingList(DaTaoKeApiUtil.RANK_TYPE_HOT, null);
         List<DaTaoKeDetailV2> goodsList = new ArrayList<>();
         for (DaTaoKeDetailV2 v2 : result.getGoodsList()) {
            BigDecimal commision = MoneyBigDecimalUtil
                  .div(MoneyBigDecimalUtil.mul(v2.getActualPrice(), v2.getCommissionRate()), new BigDecimal(100));
            if (commision.multiply(new BigDecimal("0.7")).compareTo(new BigDecimal("1.01")) >= 0)
               goodsList.add(v2);
            if (commision.multiply(new BigDecimal("0.7")).compareTo(new BigDecimal("1.01")) >= 0
                  && v2.getActualPrice().compareTo(new BigDecimal(30)) < 0 && v2.getMonthSales() >= 5000) {
               Date time = new Date(TimeUtil.convertToTimeTemp(v2.getCouponEndTime(), "yyyy-MM-dd HH:mm:ss"));
               Date targetTime = new Date(TimeUtil
                     .convertToTimeTemp(TimeUtil.getGernalTime(
                           System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 2L, "yyyy-MM-dd"), "yyyy-MM-dd")
                     - 1000L);
               // 如果是凌晨选择的
               if (Calendar.getInstance().get(Calendar.HOUR_OF_DAY) < 12) {// 上午选择的计算为当天的
                  targetTime = new Date(TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(
                        System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 1L, "yyyy-MM-dd"), "yyyy-MM-dd")
                        - 1000L);
               }
               if (time.getTime() >= targetTime.getTime())
                  goodsList.add(v2);
            }
         }
         return goodsList;
      } else