Merge remote-tracking branch 'origin/master'

yujian

2019-05-29 85fa0a9ed1f6cec968ca8e7ee80db872eb22c9cb

 fanli/src/main/java/com/yeshi/fanli/job/UpdateDaTaoKeJob.java

@@ -52,14 +52,10 @@
         autoRule.setStartWeight(1);

         autoRule.setEndWeight(3000);

         autoRule.setGoodsSource(QualityFactory.SOURCE_TAOBAO_DATAOKE);

         qualityFactoryService.autoInsertOrUpadateStorage(listgoods, null, autoRule);

         qualityFactoryService.autoInsertOrUpadateStorage(autoRule, listgoods, null, null);



      } catch (Exception e) {

         try {

            LogHelper.errorDetailInfo(e);

         } catch (Exception e1) {

            e1.printStackTrace();

         }

         LogHelper.errorDetailInfo(e);

      }



   }

@@ -79,11 +75,7 @@
         }).start();



      } catch (Exception e) {

         try {

            LogHelper.errorDetailInfo(e);

         } catch (Exception e1) {

            e1.printStackTrace();

         }

         LogHelper.errorDetailInfo(e);

      }

   }