Merge remote-tracking branch 'origin/master'

admin

2019-01-29 a6b1160da8cbb78a664a6dd7496bee648c7c148c

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

@@ -887,7 +887,7 @@
      } else if ("订单结算".equalsIgnoreCase(taoBaoOrder.getOrderState())) {

         state = CommonOrder.STATE_JS;

      }



      commonOrder.setOrderBy(taoBaoOrder.getOrderBy());

      commonOrder.setState(state);

      commonOrder.setThirdCreateTime(

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