From bb07147aaa96d1ef4c99e358dbbe7dad160dc62a Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 19 十二月 2019 15:43:23 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 214 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 177 insertions(+), 37 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..f99b69a 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;
@@ -28,12 +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.WXUtil;
+import org.yeshi.utils.wx.WXRedPackUtil;
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;
@@ -56,12 +50,13 @@
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;
+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 +103,12 @@
@Resource
private TaoBaoWeiQuanOrderService taoBaoWeiQuanOrderService;
+
+ @Resource
+ private UserInfoExtraService userInfoExtraService;
+
+ @Resource
+ private CommonOrderCountService commonOrderCountService;
/**
*
@@ -399,6 +400,11 @@
if (adminUser == null) {
record.setAdminUser(new AdminUser());
}
+ // 鏌ヨ鐢ㄦ埛澶囨敞淇℃伅
+ UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(record.getExtract().getUserInfo().getId());
+ if (extra != null) {
+ record.getExtract().getUserInfo().setStateDesc(extra.getMark());
+ }
int warnLevel = 0;
Extract extract = record.getExtract();
@@ -438,7 +444,29 @@
}
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);
@@ -448,7 +476,7 @@
GsonBuilder gsonBuilder = new GsonBuilder();
gsonBuilder.serializeNulls();
gsonBuilder.setDateFormat("yyyy-MM-dd HH:mm:ss");
-
+
Gson gson = gsonBuilder.create();
JSONObject data = new JSONObject();
@@ -461,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("搴楅摵/鍟嗗搧鏃犲紓甯�"));
}
/**
@@ -563,6 +612,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);
@@ -626,6 +682,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);
@@ -838,8 +901,8 @@
innerList.put("name", "椹冲洖鏁�");
}
- List<ChartTDO> list = extractAuditRecordService.countAuditTotal(state, dateType, year,
- startTime, endTime);
+ List<ChartTDO> list = extractAuditRecordService.countAuditTotal(state, dateType, year, startTime,
+ endTime);
if (dateType != 3) {
innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));
} else {
@@ -923,8 +986,8 @@
JSONObject innerList = new JSONObject();
innerList.put("name", "鎬昏");
- List<ChartTDO> list = extractAuditRecordService.countExtractApplyMoney(null, dateType, year,
- startTime, endTime);
+ List<ChartTDO> list = extractAuditRecordService.countExtractApplyMoney(null, dateType, year, startTime,
+ endTime);
if (dateType != 3) {
innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));
@@ -1008,12 +1071,11 @@
Gson gson = new Gson();
List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
-
JSONObject innerList = new JSONObject();
innerList.put("name", "鎬昏");
- List<ChartTDO> list = extractAuditRecordService.countExtractApplyNumber(null, dateType, year,
- startTime, endTime);
+ List<ChartTDO> list = extractAuditRecordService.countExtractApplyNumber(null, dateType, year, startTime,
+ endTime);
if (dateType != 3) {
innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));
@@ -1044,39 +1106,58 @@
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();
+ //List<String> list = extractService.getAutoExtractOpenIds();
+ List<String> list = extractService.getAutoExtractOpenIdsTo1212();
if (list == null || list.size() <= 1) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐢ㄦ埛婊¤冻鑷姩鎻愮幇鏉′欢"));
return;
}
-
- String filepath = "鑷姩鎻愮幇OpenId "+ java.lang.System.currentTimeMillis() + ".txt";
+
+ 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") + "\"");
-
+ 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");
+ for (String t : list) {
+ sb.append(t + "\r\n");
}
-
- OutputStream os = response.getOutputStream();
- byte[] byt = sb.toString().getBytes();
- os.write(byt);
- os.flush();
- os.close();
+
+ 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) {
@@ -1085,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) {
@@ -1095,6 +1176,65 @@
out.print(JsonUtil.loadFalseResult("涓婁紶澶辫触"));
}
}
-
+
+ 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, PrintWriter out) {
+ try {
+ //List<UserInfo> list = extractService.preAutoUser();
+ List<UserInfo> list = extractService.preAutoUserTo1212();
+ 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