Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-10-18 3aadf7bed39a775349097ca991878613717b768f

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

@@ -50,6 +50,7 @@
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.CommonOrderCountService;

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;

@@ -106,6 +107,8 @@
   @Resource

   private UserInfoExtraService userInfoExtraService;

   

   @Resource

   private CommonOrderCountService commonOrderCountService;



   /**

    * 

@@ -397,6 +400,11 @@
            if (adminUser == null) {

               record.setAdminUser(new AdminUser());

            }

            // 查询用户备注信息

            UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(record.getExtract().getUserInfo().getId());

            if (extra != null) {

               record.getExtract().getUserInfo().setStateDesc(extra.getMark());

            }



            int warnLevel = 0;

            Extract extract = record.getExtract();

@@ -436,7 +444,26 @@
               }

               record.setExtraInfoStr(desc.toString());

            }



            if (warnLevel == 0) {

               // 查询同店铺商品，同商品订单超过一定数量的

               List<Integer> typeList = new ArrayList<>();

               typeList.add(HongBaoV2.TYPE_ZIGOU);

               long sameGoodsOrderCount = commonOrderCountService.countSameGoodsOrderByUidAndHongBaoType(typeList,

                     record.getExtract().getUserInfo().getId(),

                     Integer.parseInt(configService.get("admin_min_same_goods_order_count")));

               long sameShopOrderCount = commonOrderCountService.countSameShopOrderByUidAndHongBaoType(typeList,

                     record.getExtract().getUserInfo().getId(),

                     Integer.parseInt(configService.get("admin_min_same_shop_order_count")));

               if (sameGoodsOrderCount > 0 || sameShopOrderCount > 0) {

                  warnLevel = 3;

                  record.setExtraInfoStr(

                        String.format("同店铺:%s   同商品:%s", sameShopOrderCount, sameGoodsOrderCount));

               }

            }



            record.setWarnLevel(warnLevel);



         }



         int count = extractAuditRecordService.getMyAuditedTimeSlotCount(key, state, null, days);

@@ -850,8 +877,8 @@
               innerList.put("name", "驳回数");

            }



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

                  startTime, endTime);

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

                  endTime);

            if (dateType != 3) {

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

            } else {

@@ -935,8 +962,8 @@
         JSONObject innerList = new JSONObject();

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



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

               startTime, endTime);

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

               endTime);



         if (dateType != 3) {

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

@@ -1020,12 +1047,11 @@
         Gson gson = new Gson();

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





         JSONObject innerList = new JSONObject();

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



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

               startTime, endTime);

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

               endTime);



         if (dateType != 3) {

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

@@ -1057,7 +1083,6 @@
      }

   }

   

	
   /**

    * 下载提现红包Openid

    * @param callback

@@ -1077,7 +1102,8 @@
         response.reset();

          response.setContentType("application/octet-stream");

          String fileName= URLDecoder.decode(filepath,"utf-8");

          response.addHeader("Content-Disposition","attachment;"+ "filename=\"" +URLEncoder.encode(fileName, "utf-8") + "\"");

         response.addHeader("Content-Disposition",

               "attachment;" + "filename=\"" + URLEncoder.encode(fileName, "utf-8") + "\"");

         

         StringBuilder sb = new StringBuilder();

         for(String t:list){