From 33b4ed2bbf28ec16b66e552680f56a691a4e908d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 12:32:00 +0800
Subject: [PATCH] 清除HongBaoMapper
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java | 446 ++++---------------------------------------------------
1 files changed, 32 insertions(+), 414 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java
index 2456d67..8a881a2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java
@@ -1,8 +1,5 @@
package com.yeshi.fanli.controller.admin;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
import java.io.PrintWriter;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -13,14 +10,7 @@
import java.util.Map;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellRangeAddress;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -31,12 +21,9 @@
import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.controller.admin.utils.AdminUtils;
import com.yeshi.fanli.dto.money.AccountDetails;
-import com.yeshi.fanli.entity.admin.UserInfoAdmin;
import com.yeshi.fanli.entity.bus.user.BindingAccount;
-import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;
import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;
-import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.entity.bus.user.MoneyRecord;
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
@@ -44,17 +31,13 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserRank;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
-import com.yeshi.fanli.entity.taobao.PidOrder;
import com.yeshi.fanli.entity.taobao.ScanHistory;
import com.yeshi.fanli.exception.user.ForbiddenUserIdentifyCodeException;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.count.UserInfoCountService;
import com.yeshi.fanli.service.inter.goods.ShareService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
-import com.yeshi.fanli.service.inter.order.OrderItemServcie;
import com.yeshi.fanli.service.inter.order.OrderService;
-import com.yeshi.fanli.service.inter.order.PidOrderService;
import com.yeshi.fanli.service.inter.user.BindingAccountService;
import com.yeshi.fanli.service.inter.user.ExtractService;
import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;
@@ -69,11 +52,9 @@
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.GsonUtil;
-import com.yeshi.fanli.util.HongBaoUtil;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.factory.AccountDetailsFactory;
-import com.yeshi.fanli.vo.user.ForbiddenUserIdentifyCodeVO;
+import com.yeshi.fanli.vo.user.UserInfoVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -97,22 +78,13 @@
private ConfigService configService;
@Resource
- private HongBaoService hongBaoService;
-
- @Resource
private ExtractService extractService;
@Resource
private ThreeSaleSerivce threeSaleService;
@Resource
- private OrderItemServcie orderItemService;
-
- @Resource
private ShareService shareService;
-
- @Resource
- private PidOrderService pidOrderService;
@Resource
private BindingAccountService bindingAccountService;
@@ -135,7 +107,6 @@
@Resource
private UserRankService userRankService;
-
@Resource
private UserMoneyDetailService userMoneyDetailService;
@@ -179,35 +150,6 @@
JSONObject data = new JSONObject();
data.put("pe", pe);
data.put("threeSaleList", list);
- out.print(JsonUtil.loadTrueResult(data));
- }
-
- /**
- *
- * 鏂规硶璇存槑: 鏌ヨ鎵�鏈夌敤鎴峰垎浜禋鍒楄〃
- *
- * @author mawurui createTime 2018骞�4鏈�24鏃� 涓嬪崍3:37:13
- * @param pageIndex
- * @param uid
- * @param out
- */
- @RequestMapping(value = "getShareMoneyList", method = RequestMethod.POST)
- public void getShareList(int pageIndex, PrintWriter out, String key) {
-
- // int totalCount = shareService.getShareMoneyCount();
- // PageEntity pageEntity = new PageEntity();
- // pageEntity.setPageIndex(pageIndex);
- // pageEntity.setPageSize(Constant.PAGE_SIZE);
- // pageEntity.setTotalCount(totalCount);
-
- int count = shareService.getCountByKey(key);
- 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);
-
- List<PidOrder> shareMoneyList = shareService.getShareMoneyList(pageIndex, key);
- JSONObject data = new JSONObject();
- data.put("pageEntity", pe);
- data.put("shareMoneyList", JsonUtil.getSimpleGsonWithDate().toJson(shareMoneyList));
out.print(JsonUtil.loadTrueResult(data));
}
@@ -302,145 +244,6 @@
/**
*
- * 鏂规硶璇存槑: 鏌ヨ鐢ㄦ埛-绾㈠寘璇︽儏鍒楄〃
- *
- * @author mawurui createTime 2018骞�5鏈�10鏃� 涓婂崍11:48:58
- * @param pageIndex
- * @param uid
- * @param out
- */
- @RequestMapping(value = "getHongBaoList", method = RequestMethod.POST)
- public void getHongBaoList(int pageIndex, long uid, PrintWriter out) {
- JSONObject data = new JSONObject();
- List<HongBao> list = hongBaoService.getHongBaoList(pageIndex, uid);
- if (list.size() != 0 || list != null) {
- for (HongBao hb : list) {
- int hbType = hb.getType();
- if (hbType == HongBao.TYPE_SHARE_GOODS) { // type == 20
- Long hongbaoId = hb.getId();
- PidOrder pidOrder = pidOrderService.getPidOrderByHongBaoId(hongbaoId);
- Order order = new Order();
- order.setThirdCreateTime(pidOrder.getOrderCreateTime());
- order.setOrderId(pidOrder.getOrderId());
- order.setThirdState(pidOrder.getState());
- order.setMoney(pidOrder.getPayMoney());
- hb.setOrder(order);
- } else if (hbType == HongBao.TYPE_SHARE_YIJI || hbType == HongBao.TYPE_SHARE_ERJI) {
- Long hongbaoId = hb.getParent().getId();
- PidOrder pidOrder = pidOrderService.getPidOrderByHongBaoId(hongbaoId);
- Order order = new Order();
- order.setThirdCreateTime(pidOrder.getOrderCreateTime());
- order.setOrderId(pidOrder.getOrderId());
- order.setThirdState(pidOrder.getState());
- order.setMoney(pidOrder.getPayMoney());
- hb.setOrder(order);
- } else if (hbType == HongBao.TYPE_XINREN) {
- Order order = new Order();
- Long createtime = hb.getCreatetime();
- if (createtime != null) {
- Date ThirdCreateTime = new Date(createtime);
- order.setThirdCreateTime(ThirdCreateTime);
- }
-
- hb.setOrder(order);
-
- } else if (hb.getParent() != null) {
- hb.setOrder(hb.getParent().getOrder());
- }
- }
- }
- int count = hongBaoService.getCount(uid);
- PageEntity pe = new PageEntity();
- pe.setPageIndex(pageIndex);
- pe.setPageSize(Constant.PAGE_SIZE);
- pe.setTotalCount(count);
-
- data.put("pe", pe);
- data.put("list", JsonUtil.getSimpleGsonWithDateAndSerialization().toJson(list));
- out.print(JsonUtil.loadTrueResult(data));
- }
-
- /**
- *
- * 鏂规硶璇存槑: 鏌ヨ 鍒嗕韩璧氶〉闈㈠垪琛�
- *
- * @author mawurui createTime 2018骞�4鏈�16鏃� 涓婂崍9:54:39
- * @param pageIndex
- * @param uid
- * @param out
- */
- @RequestMapping(value = "getShareList", method = RequestMethod.POST)
- public void getShareList(int pageIndex, long uid, PrintWriter out) {
- int totalCount = shareService.getCount(uid);
- PageEntity pageEntity = new PageEntity();
- pageEntity.setPageIndex(pageIndex);
- pageEntity.setPageSize(Constant.PAGE_SIZE);
- pageEntity.setTotalCount(totalCount);
-
- List<HongBao> shareList = shareService.getShareList(pageIndex, uid);
- if (shareList.size() != 0 || shareList != null) {
- for (HongBao hb : shareList) {
- int hbType = hb.getType();
- if (hbType == HongBao.TYPE_SHARE_GOODS) { // type == 20
- Long hongbaoId = hb.getId();
- PidOrder pidOrder = pidOrderService.getPidOrderByHongBaoId(hongbaoId);
- Order order = new Order();
- order.setThirdCreateTime(pidOrder.getCreateTime());
- order.setThirdState(pidOrder.getState());
- hb.setOrder(order);
- } else if (hb.getParent() != null) {
- hb.setOrder(hb.getParent().getOrder());
- }
- }
- }
- JSONObject data = new JSONObject();
- data.put("pageEntity", pageEntity);
- data.put("shareList", GsonUtil.toJsonExpose(shareList));
- out.print(JsonUtil.loadTrueResult(data));
- }
-
- /**
- *
- * 鏂规硶璇存槑: 鏌ヨ 閭�璇疯禋椤甸潰鍒楄〃
- *
- * @author mawurui createTime 2018骞�4鏈�16鏃� 涓婂崍9:54:39
- * @param pageIndex
- * @param uid
- * @param out
- */
- @RequestMapping(value = "getInviteList", method = RequestMethod.POST)
- public void getInviteList(int pageIndex, long uid, PrintWriter out) {
- int totalCount = shareService.getInviteCount(uid);
- PageEntity pageEntity = new PageEntity();
- pageEntity.setPageIndex(pageIndex);
- pageEntity.setPageSize(Constant.PAGE_SIZE);
- pageEntity.setTotalCount(totalCount);
-
- List<HongBao> inviteList = shareService.getInviteList(pageIndex, uid);
- if (inviteList.size() != 0 || inviteList != null) {
- for (HongBao hb : inviteList) {
- int hbType = hb.getType();
- if (hbType == HongBao.TYPE_SHARE_GOODS) { // type == 20
- Long hongbaoId = hb.getId();
- PidOrder pidOrder = pidOrderService.getPidOrderByHongBaoId(hongbaoId);
- Order order = new Order();
- order.setThirdCreateTime(pidOrder.getCreateTime());
- order.setThirdState(pidOrder.getState());
- hb.setOrder(order);
- } else if (hb.getParent() != null) {
- hb.setOrder(hb.getParent().getOrder());
- }
- }
- }
-
- JSONObject data = new JSONObject();
- data.put("pageEntity", pageEntity);
- data.put("inviteList", JsonUtil.getSimpleGsonWithDateAndSerialization().toJson(inviteList));
- out.print(JsonUtil.loadTrueResult(data));
- }
-
- /**
- *
* 鏂规硶璇存槑: 娓呴櫎鐢ㄦ埛鎵嬪娍瀵嗙爜
*
* @author mawurui createTime 2018骞�5鏈�4鏃� 涓嬪崍4:47:29
@@ -478,153 +281,6 @@
}
/**
- *
- * 鏂规硶璇存槑: Excel琛ㄦ牸涓嬭浇
- *
- * @author mawurui createTime 2018骞�5鏈�21鏃� 涓嬪崍2:14:44
- * @param uid
- * @param response
- */
- @SuppressWarnings("unused")
- @RequestMapping(value = "downDetailedExcel", produces = { "application/vnd.ms-excel;charset=UTF-8" })
- public void downDetailedExcel(long uid, HttpServletResponse response) {
- try {
- List<HongBao> list = hongBaoService.getHongBaoListAll(uid);
- if (list.size() != 0 || list != null) {
- for (HongBao hb : list) {
- int hbType = hb.getType();
- if (hbType == HongBao.TYPE_SHARE_GOODS) { // type == 20
- Long hongbaoId = hb.getId();
- PidOrder pidOrder = pidOrderService.getPidOrderByHongBaoId(hongbaoId);
- Order order = new Order();
- order.setOrderId(pidOrder.getOrderId());
- order.setMoney(pidOrder.getPayMoney());
- order.setThirdCreateTime(pidOrder.getCreateTime());
- order.setThirdState(pidOrder.getState());
- hb.setOrder(order);
- } else if (hbType == HongBao.TYPE_SHARE_ERJI || hbType == HongBao.TYPE_SHARE_YIJI) { // type
- // ==
- Long hongbaoId = hb.getParent().getId();
- PidOrder pidOrder = pidOrderService.getPidOrderByHongBaoId(hongbaoId);
- Order order = new Order();
- order.setOrderId(pidOrder.getOrderId());
- order.setMoney(pidOrder.getPayMoney());
- order.setThirdCreateTime(pidOrder.getCreateTime());
- order.setThirdState(pidOrder.getState());
- hb.setOrder(order);
- } else if (hb.getParent() != null) {
- hb.setOrder(hb.getParent().getOrder());
- }
- }
- }
-
- File desc = new File(this.getClass().getResource("/muban.xls").toURI());
- InputStream inStream = new FileInputStream(desc);
- Workbook wb = new HSSFWorkbook(inStream);
- Sheet sheet = wb.getSheetAt(0);
- int i = 1;
- for (; i <= list.size(); i++) {
- Row row = sheet.createRow(i);
- for (int c = 1; c < 10; c++) {
- row.createCell(c);
- }
- Cell cell = row.createCell(1);
- HongBao hongBao = list.get(i - 1);
- long createtime = hongBao.getCreatetime();
- String create = TimeUtil.getWholeTime(createtime);
- cell.setCellValue(create);
-
- Cell cell2 = row.getCell(2);
- String title = HongBaoUtil.getHongBaoTitle(hongBao.getType());
- cell2.setCellValue(title);
-
- Order order = hongBao.getOrder();
- if (order != null) {
- Cell cell3 = row.getCell(3);
- Integer orderType = order.getOrderType();
- if (orderType == null) {
- orderType = 1;
- }
- cell3.setCellValue(orderType == 1 ? "娣樺疂" : "鍏朵粬");
-
- String orderId = order.getOrderId();
- if (orderId == null) {
- orderId = "";
- }
- Cell cell4 = row.getCell(4);
- cell4.setCellValue(orderId);
-
- Cell cell5 = row.getCell(5);
- // List<Order>
- // orderItemService.findByOrderId(order.getId());
- cell5.setCellValue(order.getMoney().doubleValue());
-
- Cell cell6 = row.getCell(6);
- String stateStr = order.getThirdState();
- cell6.setCellValue(stateStr);
- /*
- * Cell cell11 = row.getCell(11); //涓嬪崟鏃堕棿 long orderTime =
- * order.getCreatetime(); String oTime =
- * TimeUtil.getWholeTime(orderTime);
- * cell11.setCellValue(oTime);
- */
- } else if (order == null) {
- Cell cell3 = row.getCell(3);
- cell3.setCellValue("娣樺疂");
-
- Cell cell4 = row.getCell(4);
- cell4.setCellValue("");
-
- Cell cell5 = row.getCell(5);
- cell5.setCellValue("");
-
- Cell cell6 = row.getCell(6);
- cell6.setCellValue("");
- } else if (hongBao.getParent() != null) {// 灞炰簬鍒嗛攢绾㈠寘
- String orderId = "";
- if (hongBao.getParent().getParent() != null) {
- orderId = hongBao.getParent().getParent().getOrder().getOrderId();
- } else {
- orderId = hongBao.getParent().getOrder().getOrderId();
- }
- Cell cell4 = row.getCell(4);
- cell4.setCellValue(orderId);
- }
- Cell cell7 = row.getCell(7);
- cell7.setCellValue(hongBao.getMoney().doubleValue());
-
- Cell cell8 = row.getCell(8);
- cell8.setCellValue(HongBaoUtil.convertState(hongBao.getState()));
-
- Cell cell9 = row.getCell(9);
- if (hongBao.getGetTime() != 0) {
- cell9.setCellValue(TimeUtil.getWholeTime(hongBao.getGetTime()));
- }
- }
- List<Extract> extractList = extractService.getExtractInfoByUid(uid);
- int ii = i;
- for (int m = 0; m < extractList.size(); m++, ii++) {
- Row row = sheet.createRow(ii);
- for (int c = 1; c < 10; c++) {
- row.createCell(c);
- }
- Cell cell = row.getCell(1);
- Extract extract = extractList.get(m);
- cell.setCellValue(TimeUtil.getWholeTime(extract.getExtractTime()));
- Cell cell2 = row.getCell(2);
- cell2.setCellValue("鎻愮幇");
- Cell cell7 = row.getCell(7);
- cell7.setCellValue(-extract.getMoney().doubleValue());
- }
- CellRangeAddress cellRangeAddress = new CellRangeAddress(0, sheet.getLastRowNum(), 1, 9);
- sheet.setAutoFilter(cellRangeAddress);
- wb.write(response.getOutputStream());
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
* 鏌ヨ鐢ㄦ埛淇℃伅鍒楄〃--鐩稿叧鏁版嵁缁熻
*
* @param callback
@@ -644,22 +300,15 @@
* @param out
*/
@RequestMapping(value = "query")
- public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer userType, Integer days,
- String startTime, String endTime, Integer orderMode, PrintWriter out) {
+ public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer keyType, Integer rank,
+ Integer days, String startTime, String endTime, Integer orderMode, Integer type, PrintWriter out) {
try {
-
- // 缁撴潫鏃堕棿 2018-06-06 00:00:00 鍔犱笂涓�澶�
- if (!StringUtil.isNullOrEmpty(endTime)) {
-
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- Date enddate = sdf.parse(endTime);
- Calendar c = Calendar.getInstance();
- c.setTime(enddate);
- c.add(Calendar.DAY_OF_MONTH, 1);// 浠婂ぉ+1澶�
- endTime = sdf.format(c.getTime());
+ if (type == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛绫诲瀷type涓嶈兘涓虹┖"));
+ return;
}
-
+
if (pageIndex == null)
pageIndex = 1;
@@ -680,15 +329,35 @@
}
}
- List<UserInfoAdmin> userList = userInfoService.query((pageIndex - 1) * pageSize, pageSize, key, userType,
- days, startTime, endTime, orderField, orderMode);
+ String userRank = null;
+ if (rank != null) {
+ switch (rank) {
+ case 1:
+ userRank = "闈掗摐";
+ break;
+ case 2:
+ userRank = "鐧介摱";
+ break;
+ case 3:
+ userRank = "榛勯噾";
+ break;
+ case 4:
+ userRank = "閾傞噾";
+ break;
+ default:
+ break;
+ }
+ }
+
+ List<UserInfoVO> userList = userInfoService.query((pageIndex - 1) * pageSize, pageSize, type, key, keyType,
+ userRank, days, startTime, endTime, orderField, orderMode);
if (userList == null || userList.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐩稿叧鏁版嵁"));
return;
}
- long count = userInfoService.queryCount(key, userType, days, startTime, endTime);
+ long count = userInfoService.queryCount(type, key, keyType, userRank, days, startTime, endTime);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -699,7 +368,6 @@
JSONObject data = new JSONObject();
data.put("pe", pe);
- // data.put("sumMoney", sumMoney);
data.put("resultList", gson.toJson(userList));
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
@@ -1627,56 +1295,6 @@
}
- /**
- * 鏌ヨ灏佺
- * @param callback
- * @param pageIndex
- * @param pageSize
- * @param key
- * @param type
- * @param out
- */
- @RequestMapping(value = "forbiddenQuery")
- public void forbiddenQuery(String callback, Integer pageIndex, Integer pageSize, String key, Integer type, PrintWriter out) {
-
- try {
-
- if (pageIndex == null)
- pageIndex = 1;
-
- if (pageSize == null)
- pageSize = Constant.PAGE_SIZE;
-
-
- List<ForbiddenUserIdentifyCodeVO> list = forbiddenUserIdentifyCodeService.listQuery((pageIndex - 1) * pageSize,
- pageSize, key, type);
-
- if (list == null || list.size() == 0) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐩稿叧鏁版嵁"));
- return;
- }
-
- long count = forbiddenUserIdentifyCodeService.countQuery(key, type);
-
- int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
- PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
-
- GsonBuilder gsonBuilder = new GsonBuilder();
- gsonBuilder.serializeNulls();
- Gson gson = gsonBuilder.create();
-
- JSONObject data = new JSONObject();
- data.put("pe", pe);
- data.put("result_list", gson.toJson(list));
-
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
- } catch (Exception e) {
- e.printStackTrace();
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
- }
- }
-
/**
* 鐢ㄦ埛璐﹀彿- 灏佺/瑙ｅ皝
@@ -1686,13 +1304,13 @@
* @param out
*/
@RequestMapping(value = "saveForbiddenInfo")
- public void saveForbiddenInfo(String callback, String code, Integer type, boolean state, PrintWriter out) {
+ public void saveForbiddenInfo(String callback, String code, Integer type, PrintWriter out) {
try {
if (code == null || code.trim().length() == 0 || type == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍙傛暟涓嶈兘涓虹┖"));
}
- forbiddenUserIdentifyCodeService.saveForbiddenInfo(code, type, state);
+ forbiddenUserIdentifyCodeService.saveForbiddenInfo(code, type);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇敼鎴愬姛"));
--
Gitblit v1.8.0