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;

@@ -105,6 +106,9 @@


   @Resource

   private UserInfoExtraService userInfoExtraService;



   @Resource

   private CommonOrderCountService commonOrderCountService;



   /**

    * 

@@ -440,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);

@@ -1059,7 +1082,13 @@
         e.printStackTrace();

      }

   }



	
   /**

    * 下载提现红包Openid

    * @param callback

    * @param response

    * @param out

    */

   @RequestMapping(value = "downAutoExtractTxt")

   public void downAutoExtractTxt(String callback, HttpServletResponse response, PrintWriter out) {

      try {

@@ -1096,7 +1125,13 @@
         e.printStackTrace();

      }

   }



	
	
   /**

    * 上传提现红包Excel

    * @param file

    * @param out

    */

   @RequestMapping(value = "uploadExcel", method = RequestMethod.POST)

   public void uploadExcel(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {

      if (file == null) {

@@ -1115,9 +1150,16 @@
         out.print(JsonUtil.loadFalseResult("上传失败"));

      }

   }



	
	
   /**

    * 预览红包发生人

    * @param callback

    * @param pageIndex

    * @param out

    */

   @RequestMapping(value = "preAutoUser")

   public void preAutoUser(String callback, Integer pageIndex, Integer pageSize, PrintWriter out) {

   public void preAutoUser(String callback, Integer pageIndex, PrintWriter out) {

      try {

         List<UserInfo> list = extractService.preAutoUser();

         if (list == null || list.isEmpty()) {

@@ -1129,6 +1171,7 @@
            pageIndex = 1;

         }



         Integer pageSize = 100;

         if (pageSize == null || pageSize < 1) {

            pageSize = Constant.PAGE_SIZE;

         }