Merge remote-tracking branch 'origin/master'

Administrator

2018-12-18 d146e7bca73c7605af6b718b5df0b757e0034f0e

 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java

@@ -357,7 +357,7 @@
      String startTimeStr = TimeUtil.getGernalTime(startTime, "yyyy-MM-dd");

      String endTimeStr = TimeUtil.getGernalTime(endTime, "yyyy-MM-dd");

      String url = String.format(

            "http://pub.alimama.com/report/getNewTbkRefundPaymentDetails.json?spm=a219t.7664554.1998457203.105.49cc35d9eDSunp&refundType=1&searchType=3&DownloadID=DOWNLOAD_EXPORT_CPSPAYMENT_REFUND_OVERVIEW&startTime=%s&endTime=%s",

            "http://pub.alimama.com/report/getNewTbkRefundPaymentDetails.json?spm=a219t.7664554.1998457203.105.49cc35d9eDSunp&refundType=1&searchType=1&DownloadID=DOWNLOAD_EXPORT_CPSPAYMENT_REFUND_OVERVIEW&startTime=%s&endTime=%s",

            startTimeStr, endTimeStr);

      Map<String, String> headers = new HashMap<>();

      headers.put("User-Agent",

@@ -372,13 +372,13 @@


      list.addAll(getThirdWeiQuanOrders(cookies, startTime, endTime));



      if (list != null)

         for (int i = 0; i < list.size(); i++) {

            if (!list.get(i).getState().equalsIgnoreCase("维权成功")) {

               list.remove(i);

               i--;

            }

         }

      // if (list != null)

      // for (int i = 0; i < list.size(); i++) {

      // if (!list.get(i).getState().equalsIgnoreCase("维权成功")) {

      // list.remove(i);

      // i--;

      // }

      // }

      return list;

   }



@@ -646,13 +646,19 @@
                  orderRecord.setState(content);

                  break;

               case 6://

                  orderRecord.setJieSuanTime(content);

                  if (!StringUtil.isNullOrEmpty(content))

                     orderRecord.setJieSuanTime(

                           new Date(TimeUtil.convertToTimeTemp(content, "yyyy-MM-dd HH:mm:ss")));

                  break;

               case 7://

                  orderRecord.setWeiQuanTime(content);

                  if (!StringUtil.isNullOrEmpty(content))

                     orderRecord.setWeiQuanTime(

                           new Date(TimeUtil.convertToTimeTemp(content, "yyyy-MM-dd HH:mm:ss")));

                  break;

               case 8://

                  orderRecord.setWeiQuanFinishTime(content);

                  if (!StringUtil.isNullOrEmpty(content))

                     orderRecord.setWeiQuanFinishTime(

                           new Date(TimeUtil.convertToTimeTemp(content, "yyyy-MM-dd HH:mm:ss")));

                  break;

               }

            }

@@ -674,8 +680,15 @@
      orderItem.setSettlementTime(0L);

      String createTime = tbo.getCreateTime();

      orderItem.setCreateTime(TimeUtil.convertDateToTemp2(createTime));

      orderItem.setFanMoney(MoneyBigDecimalUtil.mul(rate.divide(BigDecimal.valueOf(100)), tbo.getEstimate()));

      orderItem.setPayMoney(tbo.getPayment());

      if ("订单结算".equalsIgnoreCase(tbo.getOrderState()))

         orderItem.setFanMoney(MoneyBigDecimalUtil.mul(rate.divide(BigDecimal.valueOf(100)), tbo.geteIncome()));

      else

         orderItem.setFanMoney(MoneyBigDecimalUtil.mul(rate.divide(BigDecimal.valueOf(100)), tbo.getEstimate()));

      if ("订单结算".equalsIgnoreCase(tbo.getOrderState()))

         orderItem.setPayMoney(tbo.getSettlement());

      else

         orderItem.setPayMoney(tbo.getPayment());



      orderItem.setOrder(order);

      orderItem.setOrderId(tbo.getOrderId());



@@ -787,6 +800,8 @@
      for (TaoBaoOrder order : orderList) {

         if (map.get(order.getOrderId()) == null)

            map.put(order.getOrderId(), new ArrayList<>());

         // 设置排序值，从1开始

         order.setOrderBy(map.get(order.getOrderId()).size() + 1);

         map.get(order.getOrderId()).add(order);

      }

      return map;

@@ -809,7 +824,10 @@
      pidOrder.setOrderType(taoBaoOrder.getOrderType());

      pidOrder.setRate(taoBaoOrder.getiRatio());

      pidOrder.setPayMoney(taoBaoOrder.getPayment());

      pidOrder.setPreMoney(taoBaoOrder.getEstimate());

      if ("订单结算".equalsIgnoreCase(taoBaoOrder.getOrderState()))

         pidOrder.setPreMoney(taoBaoOrder.geteIncome());

      else

         pidOrder.setPreMoney(taoBaoOrder.getEstimate());

      pidOrder.setFinalMoney(taoBaoOrder.getSettlement());

      if (!StringUtil.isNullOrEmpty(taoBaoOrder.getSettlementTime()))

         pidOrder.setBalanceTime(new Date(TimeUtil.convertDateToTemp2(taoBaoOrder.getSettlementTime())));