Merge branch 'master' into div

admin

2019-07-17 67f311be5d75450de39ab8b25181c1c7dc11a151

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

@@ -387,16 +387,39 @@
            Extract extract = record.getExtract();

            if (extract != null) {

               Integer extractState = extract.getState();

               if (extractState != null && extractState == 0) {

               if (extractState != null && extractState == Extract.STATE_NOT_PROCESS) {

                  UserInfo userInfo = extract.getUserInfo();

                  if (userInfo != null) {

                     double countTodayMoney = extractService.countTodayMoney(userInfo.getId());

                     if (countTodayMoney >= 100) {

                     BigDecimal countTodayMoney = extractService.sumTodayApplyMoney(userInfo.getId(),

                           TimeUtil.getGernalTime(extract.getExtractTime()));

                     if (countTodayMoney.compareTo(new BigDecimal(100)) > 0) {

                        warnLevel = 1;

                     }

                  }

               }

            }



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

               StringBuffer desc = new StringBuffer();

               if (System.currentTimeMillis() > TimeUtil.convertToTimeTemp("2019-06-21", "yyyy-MM-dd")) {

                  desc.append("大笔订单数:" + record.getExtraInfo().getOrderCount50More() + "\n#");

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

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

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

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

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

                     warnLevel = 2;

               } else {

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

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

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

                     warnLevel = 2;

                  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);

         }

@@ -407,6 +430,8 @@


         GsonBuilder gsonBuilder = new GsonBuilder();

         gsonBuilder.serializeNulls();

         gsonBuilder.setDateFormat("yyyy-MM-dd HH:mm:ss");

			
         Gson gson = gsonBuilder.create();



         JSONObject data = new JSONObject();

@@ -631,6 +656,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);