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

admin

2020-02-23 121c5ee5345d366ae4aadf7901af9b0678dbb7a8

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

@@ -432,7 +432,7 @@
                  desc.append("维权订单数:" + record.getExtraInfo().getWeiQuanOrderCount() + "\n#");

                  desc.append("维权订单佣金:" + record.getExtraInfo().getWeiQuanOrderFanAmount() + "\n#");

                  if (record.getExtraInfo().getOrderCount50More() > 0

                        || record.getExtraInfo().getWeiQuanOrderCount() > 1

                        || record.getExtraInfo().getWeiQuanOrderCount() > 0

                        || record.getExtraInfo().getWeiQuanOrderFanAmount().compareTo(new BigDecimal(10)) >= 0)

                     warnLevel = 2;

               } else {