From b26ab14c4cdfa3329ac1b057abf09461115fb8b3 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期五, 18 十月 2019 14:54:52 +0800 Subject: [PATCH] 自动提现优化 --- fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 96 +++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 87 insertions(+), 9 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java index 7e003a8..99c5dd8 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java @@ -1,11 +1,5 @@ package com.yeshi.fanli.controller.admin; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileOutputStream; -import java.io.FileReader; -import java.io.IOException; -import java.io.InputStream; import java.io.OutputStream; import java.io.PrintWriter; import java.math.BigDecimal; @@ -33,7 +27,6 @@ import org.yeshi.utils.IPUtil; import org.yeshi.utils.JsonUtil; import org.yeshi.utils.entity.wx.RedPackRecord; -import org.yeshi.utils.wx.WXUtil; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -44,6 +37,7 @@ import com.yeshi.fanli.entity.bus.user.ExtractAuditRecord; import com.yeshi.fanli.entity.bus.user.HongBaoV2; 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.exception.ExtractException; import com.yeshi.fanli.exception.NotExistObjectException; @@ -59,9 +53,9 @@ 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.user.UserInfoExtraService; import com.yeshi.fanli.tag.PageEntity; import com.yeshi.fanli.util.Constant; -import com.yeshi.fanli.util.FileUtil; import com.yeshi.fanli.util.RedisManager; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.TimeUtil; @@ -108,6 +102,10 @@ @Resource private TaoBaoWeiQuanOrderService taoBaoWeiQuanOrderService; + + @Resource + private UserInfoExtraService userInfoExtraService; + /** * @@ -562,7 +560,14 @@ } else { surplusTime = DateUtil.dateDiff(formattodayTime, formatTime); } + + String mark = ""; + UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(extract.getUserInfo().getId()); + if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getMark())) { + mark = "璀︽儠锛侊紒 " + userInfoExtra.getMark(); + } + data.put("mark",mark); data.put("extract", extract); data.put("beforeMoney", beforeMoney); data.put("surplusTime", surplusTime); @@ -626,6 +631,13 @@ surplusTime = DateUtil.dateDiff(formattodayTime, formatTime); } + String mark = ""; + UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(extract.getUserInfo().getId()); + if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getMark())) { + mark = "璀︽儠锛侊紒 " + userInfoExtra.getMark(); + } + + data.put("mark",mark); data.put("extract", extract); data.put("beforeMoney", beforeMoney); data.put("surplusTime", surplusTime); @@ -1045,6 +1057,13 @@ } } + + /** + * 涓嬭浇鎻愮幇绾㈠寘Openid + * @param callback + * @param response + * @param out + */ @RequestMapping(value = "downAutoExtractTxt") public void downAutoExtractTxt(String callback, HttpServletResponse response, PrintWriter out) { try { @@ -1065,8 +1084,13 @@ sb.append(t+"\r\n"); } + String opid_str = sb.toString(); + if (!StringUtil.isNullOrEmpty(opid_str) && opid_str.endsWith("\r\n")) { + opid_str = opid_str.substring(0, opid_str.length() - 2); + } + OutputStream os = response.getOutputStream(); - byte[] byt = sb.toString().getBytes(); + byte[] byt = opid_str.getBytes(); os.write(byt); os.flush(); os.close(); @@ -1077,6 +1101,11 @@ } + /** + * 涓婁紶鎻愮幇绾㈠寘Excel + * @param file + * @param out + */ @RequestMapping(value = "uploadExcel", method = RequestMethod.POST) public void uploadExcel(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) { if (file == null) { @@ -1096,5 +1125,54 @@ } } + + /** + * 棰勮绾㈠寘鍙戠敓浜� + * @param callback + * @param pageIndex + * @param out + */ + @RequestMapping(value = "preAutoUser") + public void preAutoUser(String callback, Integer pageIndex, PrintWriter out) { + try { + List<UserInfo> list = extractService.preAutoUser(); + if (list == null || list.isEmpty()) { + JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐢ㄦ埛婊¤冻鑷姩鎻愮幇鏉′欢")); + return; + } + + if (pageIndex == null || pageIndex < 1) { + pageIndex = 1; + } + + Integer pageSize = 100; + if (pageSize == null || pageSize < 1) { + pageSize = Constant.PAGE_SIZE; + } + + int count = list.size(); + int totalPage = count % pageSize == 0 ? count / pageSize : count / pageSize + 1; + PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage); + + List<UserInfo> listResult = null; + if (pageIndex < totalPage) { + int start = (pageIndex - 1) * pageSize; + listResult = list.subList(start, start + pageSize); + } else if (pageIndex == totalPage) { + listResult = list.subList((pageIndex - 1) * pageSize, list.size()); + } else { + JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("娌℃湁鏇村浜�")); + return; + } + + JSONObject data = new JSONObject(); + data.put("pe", pe); + data.put("result_list", listResult); + JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data)); + } catch (Exception e) { + JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")); + e.printStackTrace(); + } + } } -- Gitblit v1.8.0