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

admin

2019-08-19 9c09cead959dbeef292628f345e5f80c30fc3d17

 fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java

@@ -371,7 +371,14 @@
   public void doJob2() {

      if (!Constant.IS_TASK)

         return;

      doTaoBaoWeiQuanOrder(2);

      LogHelper.error("处理返利到账前置");

      try {

			
         doTaoBaoWeiQuanOrder(2);

      } catch (Exception e) {

      LogHelper.errorDetailInfo(e);

      }

      LogHelper.error("开始处理返利");

      orderProcessService.fanli();

   }