版本修改

yujian

2019-12-28 6fb64247b9f4a74c386c06251fb678dfa9f48ada

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

@@ -22,11 +22,11 @@
import org.springframework.web.bind.annotation.RequestMethod;

import org.springframework.web.bind.annotation.RequestParam;

import org.springframework.web.multipart.commons.CommonsMultipartFile;

import org.yeshi.utils.CsvUtil;

import org.yeshi.utils.DateUtil;

import org.yeshi.utils.IPUtil;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.entity.wx.RedPackRecord;

import org.yeshi.utils.wx.WXRedPackUtil;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

@@ -445,22 +445,25 @@
               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));

               }

            }

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



@@ -486,6 +489,27 @@
         e.printStackTrace();

         out.print(JsonUtil.loadFalseResult(e.getMessage()));

      }

   }



   @RequestMapping(value = "getMyAuditedDanger")

   public void getMyAuditedDanger(String callback, Long uid, PrintWriter out) {

      if (uid == null) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请登录"));

         return;

      }

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

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

      typeList.add(HongBaoV2.TYPE_ZIGOU);

      long sameGoodsOrderCount = commonOrderCountService.countSameGoodsOrderByUidAndHongBaoType(typeList, uid,

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

      long sameShopOrderCount = commonOrderCountService.countSameShopOrderByUidAndHongBaoType(typeList, uid,

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

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

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

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

         return;

      }

      JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("店铺/商品无异常"));

   }



   /**

@@ -1083,6 +1107,13 @@
      }

   }



   /**

    * 下载提现红包Openid

    * 
    * @param callback

    * @param response

    * @param out

    */

   @RequestMapping(value = "downAutoExtractTxt")

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

      try {

@@ -1120,6 +1151,12 @@
      }

   }



   /**

    * 上传提现红包Excel

    * 
    * @param file

    * @param out

    */

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

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

      if (file == null) {

@@ -1128,7 +1165,7 @@
      }



      try {

         List<RedPackRecord> list = CsvUtil.getCsvData(file, RedPackRecord.class);

         List<RedPackRecord> list = WXRedPackUtil.readCsv(file.getInputStream());

         extractService.updateManualExtractRecord(list);

         out.print(JsonUtil.loadTrueResult("上传成功"));

      } catch (ExtractException e) {

@@ -1139,8 +1176,24 @@
      }

   }



	
   public static String getValue(String[] item,int index){

        if(item.length > index){

            String value = item[index];

            return value;

        }

        return "";

    }

	
   /**

    * 预览红包发生人

    * 
    * @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()) {

@@ -1152,6 +1205,7 @@
            pageIndex = 1;

         }



         Integer pageSize = 100;

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

            pageSize = Constant.PAGE_SIZE;

         }

@@ -1180,5 +1234,5 @@
         e.printStackTrace();

      }

   }



}