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 | 242 ++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 204 insertions(+), 38 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 d25c44e..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,8 +1,10 @@ package com.yeshi.fanli.controller.admin; +import java.io.OutputStream; import java.io.PrintWriter; import java.math.BigDecimal; import java.net.URLDecoder; +import java.net.URLEncoder; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -13,22 +15,29 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; 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 com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import com.yeshi.fanli.controller.admin.utils.AdminUtils; +import com.yeshi.fanli.dto.ChartTDO; import com.yeshi.fanli.entity.bus.user.Extract; 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; @@ -36,15 +45,15 @@ import com.yeshi.fanli.log.LogHelper; import com.yeshi.fanli.service.AdminUserService; import com.yeshi.fanli.service.inter.config.ConfigService; -import com.yeshi.fanli.service.inter.count.ExtractCountService; import com.yeshi.fanli.service.inter.count.HongBaoV2CountService; import com.yeshi.fanli.service.inter.count.UserInfoCountService; +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.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.taobao.TaoBaoOrderService; -import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService; -import com.yeshi.fanli.service.inter.user.AccountMessageService; -import com.yeshi.fanli.service.inter.user.ExtractAuditRecordService; -import com.yeshi.fanli.service.inter.user.ExtractService; +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.RedisManager; @@ -71,9 +80,6 @@ private ExtractCountService extractCountService; @Resource - private AccountMessageService accountMessageService; - - @Resource private PushRecordService pushRecordService; @Resource @@ -96,7 +102,10 @@ @Resource private TaoBaoWeiQuanOrderService taoBaoWeiQuanOrderService; - + + @Resource + private UserInfoExtraService userInfoExtraService; + /** * @@ -131,17 +140,19 @@ // 鏃ュ織璁板綍 if (integer == null) { JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("宸查�氳繃")); - LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "閫氳繃浜哰id=" + id + "]鐨勬彁鐜扮敵璇�!"); + LogHelper + .userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "閫氳繃浜哰id=" + id + "]鐨勬彁鐜扮敵璇�!"); } else if (integer == 1) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ユ彁鐜拌褰曞凡涓嶅瓨鍦�,璇峰埛鏂�")); - LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "][绠$悊鍛�:" + admin.getName() + "] 鍚屾剰鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇蜂笉瀛樺湪"); + LogHelper.userInfo( + "[ip:" + IPUtil.getRemotIP(request) + "][绠$悊鍛�:" + admin.getName() + "] 鍚屾剰鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇蜂笉瀛樺湪"); } else { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ョ敤鎴峰凡琚鐞�,璇峰埛鏂�")); - LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "][绠$悊鍛�:" + admin.getName() + "] 鍚屾剰鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇风姸鎬佸紓甯�"); + LogHelper.userInfo( + "[ip:" + IPUtil.getRemotIP(request) + "][绠$悊鍛�:" + admin.getName() + "] 鍚屾剰鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇风姸鎬佸紓甯�"); } } - /** * @@ -170,7 +181,6 @@ return; } - try { // 缂栫爜杞崲 reason = URLDecoder.decode(reason, "UTF-8"); @@ -179,7 +189,7 @@ } try { - + extractService.rejectExtract(id, reason, admin);// 鎻愮幇澶辫触 JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎷掔粷鎴愬姛")); @@ -201,7 +211,6 @@ } } - /** * 鑾峰彇浠婃棩鎻愮幇璁板綍锛氫粖鏃ユ�婚銆佹�绘鏁般�佹垚鍔熸鏁般�佸け璐ユ鏁� 鑾峰彇绯荤粺鎻愮幇璁板綍锛氭�婚銆佹�绘鏁� @@ -393,16 +402,39 @@ Extract extract = record.getExtract(); if (extract != null) { Integer extractState = extract.getState(); - if (extractState != null && extractState == 0) { + if (extractState != null && extractState == Extract.STATE_NOT_PROCESS) { UserInfo userInfo = extract.getUserInfo(); if (userInfo != null) { - double countTodayMoney = extractService.countTodayMoney(userInfo.getId()); - if (countTodayMoney >= 100) { + BigDecimal countTodayMoney = extractService.sumTodayApplyMoney(userInfo.getId(), + TimeUtil.getGernalTime(extract.getExtractTime())); + if (countTodayMoney.compareTo(new BigDecimal(100)) > 0) { warnLevel = 1; } } } + } + if (record.getExtraInfo() != null) { + StringBuffer desc = new StringBuffer(); + if (System.currentTimeMillis() > TimeUtil.convertToTimeTemp("2019-06-21", "yyyy-MM-dd")) { + desc.append("澶х瑪璁㈠崟鏁�:" + record.getExtraInfo().getOrderCount50More() + "\n#"); + desc.append("缁存潈璁㈠崟鏁�:" + record.getExtraInfo().getWeiQuanOrderCount() + "\n#"); + desc.append("缁存潈璁㈠崟浣i噾:" + record.getExtraInfo().getWeiQuanOrderFanAmount() + "\n#"); + if (record.getExtraInfo().getOrderCount50More() > 0 + || record.getExtraInfo().getWeiQuanOrderCount() > 1 + || record.getExtraInfo().getWeiQuanOrderFanAmount().compareTo(new BigDecimal(10)) >= 0) + warnLevel = 2; + } else { + if (record.getExtraInfo().getOrderCount50More() > 0 + || record.getExtraInfo().getWeiQuanOrderCount() > 0 + || record.getExtraInfo().getWeiQuanOrderFanAmount().compareTo(new BigDecimal(0)) > 0) + warnLevel = 2; + desc.append("澶т簬50鍏冭鍗�:" + record.getExtraInfo().getOrderCount50More() + "\n#"); + desc.append("缁存潈璁㈠崟鏁�:" + record.getExtraInfo().getWeiQuanOrderCount() + "\n#"); + desc.append("缁存潈璁㈠崟閫�鍥為噾棰�:" + record.getExtraInfo().getWeiQuanOrderFanAmount() + "\n#"); + desc.append("180澶╁畨鍏ㄨ鍗曟暟:" + record.getExtraInfo().getSafeOrderCount()); + } + record.setExtraInfoStr(desc.toString()); } record.setWarnLevel(warnLevel); } @@ -413,6 +445,8 @@ GsonBuilder gsonBuilder = new GsonBuilder(); gsonBuilder.serializeNulls(); + gsonBuilder.setDateFormat("yyyy-MM-dd HH:mm:ss"); + Gson gson = gsonBuilder.create(); JSONObject data = new JSONObject(); @@ -526,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); @@ -590,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); @@ -635,6 +683,18 @@ if (list == null || list.size() == 0) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鎻愮幇璁板綍")); return; + } + + for (ExtractAuditRecord record : list) { + + if (record.getExtraInfo() != null) { + StringBuffer desc = new StringBuffer(); + desc.append("澶т簬50鍏冭鍗�:" + record.getExtraInfo().getOrderCount50More() + "\n#"); + desc.append("缁存潈璁㈠崟鏁�:" + record.getExtraInfo().getWeiQuanOrderCount() + "\n#"); + desc.append("缁存潈璁㈠崟閫�鍥為噾棰�:" + record.getExtraInfo().getWeiQuanOrderFanAmount() + "\n#"); + desc.append("180澶╁畨鍏ㄨ鍗曟暟:" + record.getExtraInfo().getSafeOrderCount()); + record.setExtraInfoStr(desc.toString()); + } } int count = extractAuditRecordService.getByUidCount(uid); @@ -716,7 +776,7 @@ } try { - extractService.checkExtract(uid); + extractService.checkExtract(Long.parseLong(uid)); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("璧勯噾姝e父")); } catch (ExtractException e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg())); @@ -790,9 +850,8 @@ innerList.put("name", "椹冲洖鏁�"); } - List<Map<String, Object>> list = extractAuditRecordService.countAuditTotal(state, dateType, year, + List<ChartTDO> list = extractAuditRecordService.countAuditTotal(state, dateType, year, startTime, endTime); - if (dateType != 3) { innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list))); } else { @@ -804,7 +863,6 @@ } innerList.put("data", gson.toJson(map.get("value"))); } - line_list.add(innerList); } @@ -816,9 +874,7 @@ } data.put("line_list", line_list); - JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data)); - } catch (Exception e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")); e.printStackTrace(); @@ -844,7 +900,6 @@ @RequestMapping(value = "getExtractApplyMoney") public void getExtractApplyMoney(String callback, Integer dateType, String year, String startTime, String endTime, PrintWriter out) { - String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime); if (validateMsg != null) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg)); @@ -877,12 +932,10 @@ List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year); Gson gson = new Gson(); - JSONArray line_list = new JSONArray(); - JSONObject innerList = new JSONObject(); innerList.put("name", "鎬昏"); - List<Map<String, Object>> list = extractAuditRecordService.countExtractApplyMoney(null, dateType, year, + List<ChartTDO> list = extractAuditRecordService.countExtractApplyMoney(null, dateType, year, startTime, endTime); if (dateType != 3) { @@ -897,6 +950,7 @@ innerList.put("data", gson.toJson(map.get("value"))); } + JSONArray line_list = new JSONArray(); line_list.add(innerList); JSONObject data = new JSONObject(); @@ -907,9 +961,7 @@ } data.put("line_list", line_list); - JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data)); - } catch (Exception e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")); e.printStackTrace(); @@ -937,7 +989,6 @@ @RequestMapping(value = "getExtractApplyNumber") public void getExtractApplyNumber(String callback, Integer state, Integer dateType, String year, String startTime, String endTime, PrintWriter out) { - String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime); if (validateMsg != null) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg)); @@ -965,17 +1016,15 @@ } try { - Object objectDate = null; + Gson gson = new Gson(); List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year); - Gson gson = new Gson(); - JSONArray line_list = new JSONArray(); JSONObject innerList = new JSONObject(); innerList.put("name", "鎬昏"); - List<Map<String, Object>> list = extractAuditRecordService.countExtractApplyNumber(null, dateType, year, + List<ChartTDO> list = extractAuditRecordService.countExtractApplyNumber(null, dateType, year, startTime, endTime); if (dateType != 3) { @@ -990,6 +1039,7 @@ innerList.put("data", gson.toJson(map.get("value"))); } + JSONArray line_list = new JSONArray(); line_list.add(innerList); JSONObject data = new JSONObject(); @@ -1000,9 +1050,125 @@ } data.put("line_list", line_list); - JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data)); + } catch (Exception e) { + JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")); + e.printStackTrace(); + } + } + + + /** + * 涓嬭浇鎻愮幇绾㈠寘Openid + * @param callback + * @param response + * @param out + */ + @RequestMapping(value = "downAutoExtractTxt") + public void downAutoExtractTxt(String callback, HttpServletResponse response, PrintWriter out) { + try { + List<String> list = extractService.getAutoExtractOpenIds(); + if (list == null || list.size() <= 1) { + JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐢ㄦ埛婊¤冻鑷姩鎻愮幇鏉′欢")); + return; + } + + String filepath = "鑷姩鎻愮幇OpenId "+ java.lang.System.currentTimeMillis() + ".txt"; + 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") + "\""); + + StringBuilder sb = new StringBuilder(); + for(String t:list){ + 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 = opid_str.getBytes(); + os.write(byt); + os.flush(); + os.close(); + } catch (Exception e) { + JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")); + 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) { + out.print(JsonUtil.loadFalseResult("涓婁紶鏂囦欢涓嶈兘涓虹┖锛�")); + return; + } + try { + List<RedPackRecord> list = CsvUtil.getCsvData(file, RedPackRecord.class); + extractService.updateManualExtractRecord(list); + out.print(JsonUtil.loadTrueResult("涓婁紶鎴愬姛")); + } catch (ExtractException e) { + out.print(JsonUtil.loadFalseResult(e.getMsg())); + } catch (Exception e) { + e.printStackTrace(); + out.print(JsonUtil.loadFalseResult("涓婁紶澶辫触")); + } + } + + + /** + * 棰勮绾㈠寘鍙戠敓浜� + * @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