Merge remote-tracking branch 'origin/master'

admin

2019-01-10 02d8f36a2a51a2ffcacdb619bee34077da61b328

 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java

@@ -70,10 +70,6 @@
            taoBaoOrderMapper.insertSelective(taoBaoOrder);

         }

      } else {

         //测试

         if(1>0)

            return;

			
         boolean hasPayOrder = false;

         for (TaoBaoOrder order : oldOrderList)

            if (order.getOrderState().equalsIgnoreCase("订单付款")) {