Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

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

@@ -308,15 +308,8 @@
      return getOrderList(30, config);

   }







   public static List<TaoBaoWeiQuanOrder> getWeiQuanOrders(String excelPath) {

      try {

         return parseWeiQuanOrder(new FileInputStream(new File(excelPath)));

      } catch (FileNotFoundException e) {

         e.printStackTrace();

      }

      return null;

   public static List<TaoBaoWeiQuanOrder> getWeiQuanOrders(InputStream input) {

      return parseWeiQuanOrder(input);

   }



   private static List<TaoBaoWeiQuanOrder> getWeiQuanOrders(String cookies, long startTime, long endTime) {

@@ -575,41 +568,41 @@
            for (int c = 0; c < sheet.getColumns(); c++) {

               String content = sheet.getCell(c, r).getContents().trim();

               switch (c) {

               case 0://维权时间

               case 0:// 维权时间

                  if (!StringUtil.isNullOrEmpty(content))

                     orderRecord.setWeiQuanTime(

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

                  break;

               case 1://维权完成时间

               case 1:// 维权完成时间

                  if (!StringUtil.isNullOrEmpty(content))

                     orderRecord.setWeiQuanFinishTime(

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

                  break;

               case 2://结算时间

               case 2:// 结算时间

                  if (!StringUtil.isNullOrEmpty(content))

                     orderRecord.setJieSuanTime(

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

                  break;

               case 3://商品名称

               case 3:// 商品名称

                  orderRecord.setGoodsName(content);

                  break;

               case 5://淘宝订单号

               case 5:// 淘宝订单号

                  orderRecord.setOrderId(content);

                  break;

               case 6://淘宝子订单号

               case 6:// 淘宝子订单号

                  orderRecord.setOrderItemId(content);

                  break;

               case 7://维权状态

               case 7:// 维权状态

                  orderRecord.setState(content);

                  break;

               case 8://结算金额

						
               case 8:// 结算金额



                  break;

               case 9://退款金额

               case 9:// 退款金额

                  orderRecord.setMoney(StringUtil.isNullOrEmpty(content) ? null : new BigDecimal(content));

                  break;

						
               case 10://返还商家金额	


               case 10:// 返还商家金额

                  orderRecord.setFanMoney(StringUtil.isNullOrEmpty(content) ? null : new BigDecimal(content));

                  break;

               }