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

yujian

2020-03-24 f15acf7f2d57db3a32c574b0dfc21f564dca6024

 fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java

@@ -446,8 +446,7 @@
                  desc.append("180天安全订单数:" + record.getExtraInfo().getSafeOrderCount());
               }
               
               Integer countOrder = commonOrderCountService.countOderByUidAndLess10(extract.getUserInfo().getId());
               if (countOrder != null && countOrder > 10) {
               if (record.getExtraInfo().getLess10OrderCount() != null && record.getExtraInfo().getLess10OrderCount() > 10) {
                  desc.append("刷单嫌疑\n#");
               }
               
@@ -628,7 +627,7 @@
            }

            Integer countOrder = commonOrderCountService.countOderByUidAndLess10(extract.getUserInfo().getId());
            if (countOrder != null && countOrder > 10) {
            if (countOrder != null && countOrder >= 10) {
               if (StringUtil.isNullOrEmpty(mark)) {
                  mark = "刷单预警！！";
               } else {
@@ -706,7 +705,7 @@
               }

               Integer countOrder = commonOrderCountService.countOderByUidAndLess10(extract.getUserInfo().getId());
               if (countOrder != null && countOrder > 10) {
               if (countOrder != null && countOrder >= 10) {
                  if (StringUtil.isNullOrEmpty(mark)) {
                     mark = "刷单预警！！";
                  } else {