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

admin

2019-10-11 ee88b54979c633a4ade518d4c124a2d07d378562

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

@@ -24,6 +24,7 @@
import com.google.gson.GsonBuilder;

import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.controller.admin.utils.AdminUtils;

import com.yeshi.fanli.dto.ChartTDO;

import com.yeshi.fanli.entity.bus.user.Extract;

import com.yeshi.fanli.entity.bus.user.ExtractAuditRecord;

import com.yeshi.fanli.entity.bus.user.HongBaoV2;

@@ -35,14 +36,14 @@
import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.AdminUserService;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.count.ExtractCountService;

import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;

import com.yeshi.fanli.service.inter.count.UserInfoCountService;

import com.yeshi.fanli.service.inter.money.extract.ExtractAuditRecordService;

import com.yeshi.fanli.service.inter.money.extract.ExtractCountService;

import com.yeshi.fanli.service.inter.money.extract.ExtractService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;

import com.yeshi.fanli.service.inter.push.PushRecordService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;

import com.yeshi.fanli.service.inter.user.ExtractAuditRecordService;

import com.yeshi.fanli.service.inter.user.ExtractService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

@@ -821,9 +822,8 @@
               innerList.put("name", "驳回数");

            }



            List<Map<String, Object>> list = extractAuditRecordService.countAuditTotal(state, dateType, year,

            List<ChartTDO> list = extractAuditRecordService.countAuditTotal(state, dateType, year,

                  startTime, endTime);



            if (dateType != 3) {

               innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));

            } else {

@@ -835,7 +835,6 @@
               }

               innerList.put("data", gson.toJson(map.get("value")));

            }



            line_list.add(innerList);

         }



@@ -847,9 +846,7 @@
         }



         data.put("line_list", line_list);



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));



      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常"));

         e.printStackTrace();

@@ -875,7 +872,6 @@
   @RequestMapping(value = "getExtractApplyMoney")

   public void getExtractApplyMoney(String callback, Integer dateType, String year, String startTime, String endTime,

         PrintWriter out) {



      String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime);

      if (validateMsg != null) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));

@@ -908,12 +904,10 @@
         List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);



         Gson gson = new Gson();

         JSONArray line_list = new JSONArray();



         JSONObject innerList = new JSONObject();

         innerList.put("name", "总计");



         List<Map<String, Object>> list = extractAuditRecordService.countExtractApplyMoney(null, dateType, year,

         List<ChartTDO> list = extractAuditRecordService.countExtractApplyMoney(null, dateType, year,

               startTime, endTime);



         if (dateType != 3) {

@@ -928,6 +922,7 @@
            innerList.put("data", gson.toJson(map.get("value")));

         }



         JSONArray line_list = new JSONArray();

         line_list.add(innerList);



         JSONObject data = new JSONObject();

@@ -938,9 +933,7 @@
         }



         data.put("line_list", line_list);



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));



      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常"));

         e.printStackTrace();

@@ -968,7 +961,6 @@
   @RequestMapping(value = "getExtractApplyNumber")

   public void getExtractApplyNumber(String callback, Integer state, Integer dateType, String year, String startTime,

         String endTime, PrintWriter out) {



      String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime);

      if (validateMsg != null) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));

@@ -996,17 +988,15 @@
      }



      try {



         Object objectDate = null;

         Gson gson = new Gson();

         List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);



         Gson gson = new Gson();

         JSONArray line_list = new JSONArray();



         JSONObject innerList = new JSONObject();

         innerList.put("name", "总计");



         List<Map<String, Object>> list = extractAuditRecordService.countExtractApplyNumber(null, dateType, year,

         List<ChartTDO> list = extractAuditRecordService.countExtractApplyNumber(null, dateType, year,

               startTime, endTime);



         if (dateType != 3) {

@@ -1021,6 +1011,7 @@
            innerList.put("data", gson.toJson(map.get("value")));

         }



         JSONArray line_list = new JSONArray();

         line_list.add(innerList);



         JSONObject data = new JSONObject();

@@ -1031,9 +1022,7 @@
         }



         data.put("line_list", line_list);



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));



      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常"));

         e.printStackTrace();