Merge remote-tracking branch 'origin/master'

admin

2019-05-31 03bba97b110a4c7f43fd24c9dd6806d312774efe

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

@@ -398,6 +398,19 @@
               }



            }



            if (record.getExtraInfo() != null) {

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

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

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

                  warnLevel = 2;

               StringBuffer desc = new StringBuffer();

               desc.append("大于50元订单:" + record.getExtraInfo().getOrderCount50More() + "\n#");

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

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

               desc.append("180天安全订单数:" + record.getExtraInfo().getSafeOrderCount());

               record.setExtraInfoStr(desc.toString());

            }

            record.setWarnLevel(warnLevel);

         }



@@ -631,6 +644,18 @@
            return;

         }



         for (ExtractAuditRecord record : list) {



            if (record.getExtraInfo() != null) {

               StringBuffer desc = new StringBuffer();

               desc.append("大于50元订单:" + record.getExtraInfo().getOrderCount50More() + "\n#");

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

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

               desc.append("180天安全订单数:" + record.getExtraInfo().getSafeOrderCount());

               record.setExtraInfoStr(desc.toString());

            }

         }



         int count = extractAuditRecordService.getByUidCount(uid);

         int totalPage = count % pageSize == 0 ? count / pageSize : count / pageSize + 1;

         PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);