Merge remote-tracking branch 'origin/div' into div

admin

2019-11-20 e33752e9f600e6e0cdb9c0119b5ea286be33162c

 fanli/src/main/java/com/yeshi/fanli/job/order/jd/UpdateJDOrderJob.java

@@ -37,8 +37,8 @@
    */

   public void saveJDOrders(List<JDOrder> jdOrderList) {

      for (JDOrder order : jdOrderList) {

         LogHelper.orderInfo("京东订单:" + order.getOrderId());

         if (order.getValidCode() == 15)// 过滤掉代付款状态

         LogHelper.orderInfo("京东订单:" + order.getOrderId()+"-"+order.getValidCode());

         if (order.getValidCode() == 15)// 过滤掉待付款

            continue;

         try {

            jdOrderService.addJDOrder(order);