From cd637932a970e7935b17d41568fe89c92775bccc Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 06 十二月 2019 17:18:27 +0800
Subject: [PATCH] 双12活动添加,邀请码发布修改，爬单新规则添加
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 83c40d2..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
@@ -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;
@@ -1117,7 +1117,8 @@
@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;
@@ -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 "";
+ }
+
/**
* 棰勮绾㈠寘鍙戠敓浜�
*
@@ -1186,7 +1196,8 @@
@RequestMapping(value = "preAutoUser")
public void preAutoUser(String callback, Integer pageIndex, PrintWriter out) {
try {
- List<UserInfo> list = extractService.preAutoUser();
+ //List<UserInfo> list = extractService.preAutoUser();
+ List<UserInfo> list = extractService.preAutoUserTo1212();
if (list == null || list.isEmpty()) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐢ㄦ埛婊¤冻鑷姩鎻愮幇鏉′欢"));
return;
@@ -1225,5 +1236,5 @@
e.printStackTrace();
}
}
-
}
+
--
Gitblit v1.8.0