小黄条+ 首页弹框 版本区分

yujian

2020-01-08 81ed418ee16df24b768a3f78cd22d02f020d6314

 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;

@@ -39,6 +39,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;

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

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

import com.yeshi.fanli.exception.ExtractException;

import com.yeshi.fanli.exception.NotExistObjectException;

import com.yeshi.fanli.exception.ObjectStateException;

@@ -231,8 +232,8 @@
      // 当前用户余额总计：所有用户总余额

      BigDecimal amountMoney = userInfoCountService.countAllMoney(null);



      // 可提现金额限制

      String minMoney = configService.get(Constant.EXTRACT_MIN_MONEY);

      // 可提现金额限制 
      String minMoney = configService.get(ConfigKeyEnum.extractMoneyMin.getKey());

      if (minMoney == null) {

         minMoney = "0";

      }

@@ -452,11 +453,11 @@
            // long sameGoodsOrderCount =

            // commonOrderCountService.countSameGoodsOrderByUidAndHongBaoType(typeList,

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

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

            // Integer.parseInt(configService.get(ConfigKeyEnum.adminMinSameGoodsOrderCount.getKey())));

            // long sameShopOrderCount =

            // commonOrderCountService.countSameShopOrderByUidAndHongBaoType(typeList,

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

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

            // Integer.parseInt(configService.get(ConfigKeyEnum.adminMinSameShopOrderCount.getKey())));

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

            // warnLevel = 3;

            // record.setExtraInfoStr(

@@ -501,9 +502,9 @@
      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")));

            Integer.parseInt(configService.get(ConfigKeyEnum.adminMinSameGoodsOrderCount.getKey())));

      long sameShopOrderCount = commonOrderCountService.countSameShopOrderByUidAndHongBaoType(typeList, uid,

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

            Integer.parseInt(configService.get(ConfigKeyEnum.adminMinSameShopOrderCount.getKey())));

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

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

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

@@ -1165,7 +1166,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) {

@@ -1176,6 +1177,15 @@
      }

   }



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

        if(item.length > index){

            String value = item[index];

            return value;

        }

        return "";

    }

	
   /**

    * 预览红包发生人

    * 

@@ -1225,5 +1235,5 @@
         e.printStackTrace();

      }

   }



}