From e915a40b79552686b8d8a8cfc48a341fa2c0f518 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 27 十一月 2019 18:08:47 +0800
Subject: [PATCH] 订单统计 + 资金明细
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 471 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 277 insertions(+), 194 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 89f1a50..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,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.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;
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,17 +45,16 @@
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.hongbao.HongBaoService;
-import com.yeshi.fanli.service.inter.order.OrderItemServcie;
+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.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;
@@ -73,9 +81,6 @@
private ExtractCountService extractCountService;
@Resource
- private AccountMessageService accountMessageService;
-
- @Resource
private PushRecordService pushRecordService;
@Resource
@@ -85,17 +90,11 @@
private ExtractAuditRecordService extractAuditRecordService;
@Resource
- private HongBaoService hongBaoService;
-
- @Resource
private HongBaoV2CountService hongBaoV2CountService;
@Resource
private AdminUserService adminUserService;
- @Resource
- private OrderItemServcie orderItemServcie;
-
@Resource
private RedisManager redisManager;
@@ -105,64 +104,11 @@
@Resource
private TaoBaoWeiQuanOrderService taoBaoWeiQuanOrderService;
- private final static String TODAY = "1";
- private final static String THREE = "2";
- private final static String AWEEK = "3";
+ @Resource
+ private UserInfoExtraService userInfoExtraService;
- @RequestMapping(value = "getExtractList", method = RequestMethod.POST)
- public void getExtractList(int pageIndex, PrintWriter out) {
- List<Extract> extractList = extractService.getExtractList(pageIndex - 1);
- int count = extractService.getCount();
- int totalPage = count % Constant.PAGE_SIZE == 0 ? count / Constant.PAGE_SIZE : count / Constant.PAGE_SIZE + 1;
- PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count, totalPage);
- JSONObject data = new JSONObject();
- data.put("pe", pe);
- data.put("extractList", extractList);
- out.print(JsonUtil.loadTrueResult(data));
- }
-
- /**
- *
- * 鏂规硶璇存槑: 閫氳繃鎻愮幇璇锋眰
- *
- * @author mawurui createTime 2018骞�3鏈�14鏃� 涓嬪崍3:15:42
- * @param id
- * @param out
- * @param request
- */
- @RequestMapping(value = "passExtract", method = RequestMethod.POST)
- public void passExtract(String callback, long id, PrintWriter out, HttpServletRequest request) {
-
- // TODO 闇�瑕侀偖绠卞彂閫佺煭淇￠獙璇�
-
- AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
-
- Integer integer = extractService.passExtract(id, admin);
- Extract extract = extractService.getExtractById(id);
- long uid = extract.getUserInfo().getId();
-
- if (integer == null) {
- out.print(JsonUtil.loadTrueResult("閫氳繃"));
- LogHelper
- .userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "閫氳繃浜哰id=" + id + "]鐨勬彁鐜扮敵璇�!"); // 鍚屾剰涔嬪悗鎴愬姛
- } else if (integer == 1) {
-
- out.print(JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ瀵硅薄")); // 鍚屾剰涔嬪悗澶辫触
- LogHelper.userInfo(
- "[ip:" + IPUtil.getRemotIP(request) + "][绠＄悊鍛�:" + admin.getName() + "] 鍚屾剰鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇蜂笉瀛樺湪");
- String title = "浣犵殑鎻愮幇鐢宠琚┏鍥�";
- String content = "闈炲父閬楁喚锛屼綘鐨勬彁鐜扮敵璇疯椹冲洖銆傛垜浠�氳繃鏍稿鍙戠幇浣犵殑璐︾洰鏄庣粏鏈夎锛屾垜浠細鍦ㄥ璁″畬鎴愪箣鍚庣粰浣犲彂閫氱煡娑堟伅銆傚鏈夌枒闂鑱旂郴瀹㈡湇銆�";
- // xingePushController.pushSystemZnx(uid, title, content, out);
- } else {
-
- LogHelper.userInfo(
- "[ip:" + IPUtil.getRemotIP(request) + "][绠＄悊鍛�:" + admin.getName() + "] 鍚屾剰鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇风姸鎬佸紓甯�");
- out.print(JsonUtil.loadFalseResult("璇ョ姸鎬佷笉绛変簬涓嶄负鍒濆鐘舵��"));
- String title = "浣犵殑鎻愮幇鐢宠涓嶆垚鍔�";
- String content = "璇风‘淇濅綘鐨勬彁鐜拌处鎴风殑闅愮璁剧疆涓� 鍏佽閭銆佹墜鏈哄彿銆佷細鍛樺悕鎵惧埌鎴戙�傚惁鍒欐棤娉曟垚鍔熷畬鎴愯浆璐︺�傚鏈夌枒闂鑱旂郴瀹㈡湇銆�";
- // xingePushController.pushSystemZnx(uid, title, content, out);
- }
- }
+ @Resource
+ private CommonOrderCountService commonOrderCountService;
/**
*
@@ -194,74 +140,21 @@
/* 鍏佽鎻愮幇 鎿嶄綔 */
Integer integer = extractService.passExtract(id, admin);
- Extract extract = extractService.getExtractById(id);
- long uid = extract.getUserInfo().getId();
-
+ // 鏃ュ織璁板綍
if (integer == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("閫氳繃"));
-
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("宸查�氳繃"));
LogHelper
- .userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "閫氳繃浜哰id=" + id + "]鐨勬彁鐜扮敵璇�!"); // 鍚屾剰涔嬪悗鎴愬姛
+ .userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "閫氳繃浜哰id=" + id + "]鐨勬彁鐜扮敵璇�!");
} else if (integer == 1) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ瀵硅薄"));
-
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ユ彁鐜拌褰曞凡涓嶅瓨鍦�,璇峰埛鏂�"));
LogHelper.userInfo(
"[ip:" + IPUtil.getRemotIP(request) + "][绠＄悊鍛�:" + admin.getName() + "] 鍚屾剰鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇蜂笉瀛樺湪");
- String title = "浣犵殑鎻愮幇鐢宠琚┏鍥�";
- String content = "闈炲父閬楁喚锛屼綘鐨勬彁鐜扮敵璇疯椹冲洖銆傛垜浠�氳繃鏍稿鍙戠幇浣犵殑璐︾洰鏄庣粏鏈夎锛屾垜浠細鍦ㄥ璁″畬鎴愪箣鍚庣粰浣犲彂閫氱煡娑堟伅銆傚鏈夌枒闂鑱旂郴瀹㈡湇銆�";
- // xingePushController.pushSystemZnx(uid, title, content, out);
} else {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ョ姸鎬佷笉绛変簬涓嶄负鍒濆鐘舵��"));
-
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ョ敤鎴峰凡琚鐞�,璇峰埛鏂�"));
LogHelper.userInfo(
"[ip:" + IPUtil.getRemotIP(request) + "][绠＄悊鍛�:" + admin.getName() + "] 鍚屾剰鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇风姸鎬佸紓甯�");
- String title = "浣犵殑鎻愮幇鐢宠涓嶆垚鍔�";
- String content = "璇风‘淇濅綘鐨勬彁鐜拌处鎴风殑闅愮璁剧疆涓� 鍏佽閭銆佹墜鏈哄彿銆佷細鍛樺悕鎵惧埌鎴戙�傚惁鍒欐棤娉曟垚鍔熷畬鎴愯浆璐︺�傚鏈夌枒闂鑱旂郴瀹㈡湇銆�";
- // xingePushController.pushSystemZnx(uid, title, content, out);
}
- }
-
- /**
- *
- * 鏂规硶璇存槑: 鎷掔粷鎻愮幇璇锋眰
- *
- * @author mawurui createTime 2018骞�3鏈�14鏃� 涓嬪崍3:15:55
- * @param id
- * @param reason
- * @param out
- * @param request
- */
- @RequestMapping(value = "rejectExtract", method = RequestMethod.POST)
- public void rejectExtract(String callback, long id, String reason, PrintWriter out, HttpServletRequest request) {
- AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
-
- Extract extract = extractService.getExtractById(id);
- long uid = extract.getUserInfo().getId();
- long extractTime = extract.getExtractTime();
-
- try {
- extractService.rejectExtract(id, reason, extractTime, admin);// 鎻愮幇澶辫触
-
- // 璋冪敤鎺ㄩ�佺珯鍐呬俊缁欑敤鎴�
- out.print(JsonUtil.loadTrueResult("鎷掔粷"));
- LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "鎷掔粷浜哰id=" + id
- + "]鐨勬彁鐜扮敵璇�!鎷掔粷鍘熷洜鏄�" + reason);
-
- String title = "浣犵殑鎻愮幇鐢宠琚┏鍥�";
- String content = "闈炲父閬楁喚锛屼綘鐨勬彁鐜扮敵璇疯椹冲洖銆傛垜浠�氳繃鏍稿鍙戠幇浣犵殑璐︾洰鏄庣粏鏈夎锛屾垜浠細鍦ㄥ璁″畬鎴愪箣鍚庣粰浣犲彂閫氱煡娑堟伅銆傚鏈夌枒闂鑱旂郴瀹㈡湇銆�";
- // xingePushController.pushSystemZnx(uid, title, content, out);
- } catch (ObjectStateException e) {
- LogHelper.userInfo(
- "[ip:" + IPUtil.getRemotIP(request) + "][绠＄悊鍛�:" + admin.getName() + "] 鎷掔粷鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇风姸鎬佸紓甯�!"); //
-
- out.print(JsonUtil.loadFalseResult(e.getMessage()));
- } catch (NotExistObjectException e) {
- LogHelper.userInfo(
- "[ip:" + IPUtil.getRemotIP(request) + "][绠＄悊鍛�:" + admin.getName() + "] 鎷掔粷鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇蜂笉瀛樺湪!");
-
- out.print(JsonUtil.loadFalseResult(e.getMessage()));
- }
}
/**
@@ -291,29 +184,22 @@
return;
}
- /* 鎷掔粷鎻愮幇 鎿嶄綔 */
-
try {
+ // 缂栫爜杞崲
reason = URLDecoder.decode(reason, "UTF-8");
} catch (Exception e1) {
e1.printStackTrace();
}
try {
- Extract extract = extractService.getExtractById(id);
- long extractTime = extract.getExtractTime();
- extractService.rejectExtract(id, reason, extractTime, admin);// 鎻愮幇澶辫触
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎷掔粷"));
+ extractService.rejectExtract(id, reason, admin);// 鎻愮幇澶辫触
- // 璋冪敤鎺ㄩ�佺珯鍐呬俊缁欑敤鎴�
- // out.print(JsonUtil.loadTrueResult("鎷掔粷"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎷掔粷鎴愬姛"));
+
LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "鎷掔粷浜哰id=" + id
+ "]鐨勬彁鐜扮敵璇�!鎷掔粷鍘熷洜鏄�" + reason);
- String title = "浣犵殑鎻愮幇鐢宠琚┏鍥�";
- String content = "闈炲父閬楁喚锛屼綘鐨勬彁鐜扮敵璇疯椹冲洖銆傛垜浠�氳繃鏍稿鍙戠幇浣犵殑璐︾洰鏄庣粏鏈夎锛屾垜浠細鍦ㄥ璁″畬鎴愪箣鍚庣粰浣犲彂閫氱煡娑堟伅銆傚鏈夌枒闂鑱旂郴瀹㈡湇銆�";
- // xingePushController.pushSystemZnx(uid, title, content, out);
} catch (ObjectStateException e) {
LogHelper.userInfo(
"[ip:" + IPUtil.getRemotIP(request) + "][绠＄悊鍛�:" + admin.getName() + "] 鎷掔粷鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇风姸鎬佸紓甯�!"); //
@@ -327,24 +213,6 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMessage()));
}
- }
-
- /**
- * 璧勯噾鏍￠獙鏄惁寮傚父
- *
- * @param uid
- * @param out
- */
- @RequestMapping(value = "checkExtract", method = RequestMethod.POST)
- public void checkExtract(String uid, PrintWriter out) {
- JSONObject data = new JSONObject();
- try {
- extractService.checkExtract(uid);
- data.put("code", "1"); // 姝ｅ父
- } catch (ExtractException e) {
- data.put("code", "0");// 寮傚父
- }
- out.print(data);
}
/**
@@ -444,8 +312,8 @@
if (extract != null) {
UserInfo userInfo = extract.getUserInfo();
Long id = userInfo.getId();
- countByUid = hongBaoService.getCountByUid(id);
- countCancel = hongBaoService.getCountCancelByUid(id);
+ countByUid = hongBaoV2CountService.countNumberByUid(id);
+ countCancel = hongBaoV2CountService.countNumberByUidAndState(id, HongBaoV2.STATE_SHIXIAO);
}
extractAuditRecord.setCancelOrderNum((long) countCancel);
extractAuditRecord.setOrderNum((long) countByUid);
@@ -498,13 +366,12 @@
// }
int pageSize = Constant.PAGE_SIZE;
-
Integer days = null;
- if (TODAY.equals(timeSlot)) {
+ if ("1".equals(timeSlot)) {
days = 0; // 浠婃棩
- } else if (THREE.equals(timeSlot)) {
+ } else if ("2".equals(timeSlot)) {
days = 3; // 鍓�3澶�
- } else if (AWEEK.equals(timeSlot)) {
+ } else if ("3".equals(timeSlot)) {
days = 7; // 鍓�7澶�
}
@@ -533,23 +400,73 @@
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();
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("缁存潈璁㈠崟浣ｉ噾:" + 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());
+ }
+
+ // 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);
@@ -558,6 +475,8 @@
GsonBuilder gsonBuilder = new GsonBuilder();
gsonBuilder.serializeNulls();
+ gsonBuilder.setDateFormat("yyyy-MM-dd HH:mm:ss");
+
Gson gson = gsonBuilder.create();
JSONObject data = new JSONObject();
@@ -570,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("搴楅摵/鍟嗗搧鏃犲紓甯�"));
}
/**
@@ -672,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);
@@ -735,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);
@@ -780,6 +734,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);
@@ -861,7 +827,7 @@
}
try {
- extractService.checkExtract(uid);
+ extractService.checkExtract(Long.parseLong(uid));
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("璧勯噾姝ｅ父"));
} catch (ExtractException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -935,9 +901,8 @@
innerList.put("name", "椹冲洖鏁�");
}
- List<Map<String, Object>> 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 {
@@ -949,7 +914,6 @@
}
innerList.put("data", gson.toJson(map.get("value")));
}
-
line_list.add(innerList);
}
@@ -961,9 +925,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();
@@ -989,7 +951,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));
@@ -1022,13 +983,11 @@
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,
- 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)));
@@ -1042,6 +1001,7 @@
innerList.put("data", gson.toJson(map.get("value")));
}
+ JSONArray line_list = new JSONArray();
line_list.add(innerList);
JSONObject data = new JSONObject();
@@ -1052,9 +1012,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();
@@ -1082,7 +1040,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));
@@ -1110,18 +1067,15 @@
}
try {
-
Object objectDate = null;
- List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
-
Gson gson = new Gson();
- JSONArray line_list = new JSONArray();
+ List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
JSONObject innerList = new JSONObject();
innerList.put("name", "鎬昏");
- List<Map<String, Object>> 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)));
@@ -1135,6 +1089,7 @@
innerList.put("data", gson.toJson(map.get("value")));
}
+ JSONArray line_list = new JSONArray();
line_list.add(innerList);
JSONObject data = new JSONObject();
@@ -1145,13 +1100,141 @@
}
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();
+ 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";
+ 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 = WXRedPackUtil.readCsv(file.getInputStream());
+ 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("涓婁紶澶辫触"));
+ }
+ }
+
+
+ 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