From 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 12 三月 2019 16:29:55 +0800
Subject: [PATCH] 冲突提交
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java | 177 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 148 insertions(+), 29 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 2ef76b8..2456d67 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
@@ -15,9 +15,6 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
@@ -33,18 +30,20 @@
import com.google.gson.GsonBuilder;
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.AccountDetails;
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;
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
-import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;
+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;
@@ -56,7 +55,6 @@
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.AccountDetailsService;
import com.yeshi.fanli.service.inter.user.BindingAccountService;
import com.yeshi.fanli.service.inter.user.ExtractService;
import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;
@@ -64,13 +62,21 @@
import com.yeshi.fanli.service.inter.user.ScanHistoryService;
import com.yeshi.fanli.service.inter.user.UserActiveLogService;
import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
+import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
+import com.yeshi.fanli.service.inter.user.UserRankService;
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 net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("admin/new/api/v1/user")
@@ -109,9 +115,6 @@
private PidOrderService pidOrderService;
@Resource
- private AccountDetailsService accountDetailsService;
-
- @Resource
private BindingAccountService bindingAccountService;
@Resource
@@ -125,6 +128,16 @@
@Resource
private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
+
+ @Resource
+ private UserInfoExtraService userInfoExtraService;
+
+ @Resource
+ private UserRankService userRankService;
+
+
+ @Resource
+ private UserMoneyDetailService userMoneyDetailService;
@RequestMapping(value = "getUserList", method = RequestMethod.POST)
public void getUserList(int pageIndex, String key, PrintWriter out) {
@@ -707,17 +720,49 @@
public void countInfo(String callback, PrintWriter out) {
try {
- JSONObject data = new JSONObject();
+ // 绱鐢ㄦ埛鏁伴噺
+ long totalUser = userInfoCountService.countNewUser(null, null);
+ // 娴佸け鐢ㄦ埛鏁伴噺锛�180澶╂湭浣跨敤鐧诲綍骞朵笖鏃犱换浣曡祫閲戞祦鍔ㄧ殑璐﹀彿鏁伴噺锛�
+ long loseUser = userInfoCountService.countLoseUser(180);
+ // 绱鏈夎喘涔扮敤鎴锋暟
+ long orderUser = userInfoCountService.countHasOrderUser();
// 鎬绘暟-鏅�氱敤鎴�
- long countNormal = userInfoCountService.countRank(0);
+ long countNormal = 0;
// 鎬绘暟-閾滅敤鎴�
- long countCuprum = userInfoCountService.countRank(1);
+ long countCuprum = 0;
// 鎬绘暟-閾剁敤鎴�
- long countSilver = userInfoCountService.countRank(2);
+ long countSilver = 0;
// 鎬绘暟-閲戠敤鎴�
- long countGold = userInfoCountService.countRank(3);
+ long countGold = 0;
+ List<UserRank> listRank = userRankService.getAllRank();
+ if (listRank != null && listRank.size() > 0) {
+ for (UserRank userRank : listRank) {
+ Long id = userRank.getId();
+ String name = userRank.getName();
+ if ("闈掗摐".equals(name)) {
+ continue;
+ }
+
+ long count = userInfoExtraService.countByRankId(id);
+ if ("鐧介摱".equals(name)) {
+ countCuprum = count;
+ } else if ("榛勯噾".equals(name)) {
+ countSilver = count;
+ } else if ("閾傞噾".equals(name)) {
+ countGold = count;
+ }
+ }
+ }
+
+ // 鏅�氱敤鎴疯绠�
+ countNormal = totalUser - (countCuprum + countSilver + countGold);
+
+ JSONObject data = new JSONObject();
+ data.put("totalUser", totalUser);
+ data.put("loseUser", loseUser);
+ data.put("orderUser", orderUser);
data.put("countNormal", countNormal);
data.put("countCuprum", countCuprum);
data.put("countSilver", countSilver);
@@ -735,17 +780,6 @@
* data.put("countTotalMoney", countTotalMoney);
* data.put("countCanAssets", countCanAssets);
*/
-
- // 绱鐢ㄦ埛鏁伴噺
- long totalUser = userInfoCountService.countNewUser(null, null);
- // 娴佸け鐢ㄦ埛鏁伴噺锛�180澶╂湭浣跨敤鐧诲綍骞朵笖鏃犱换浣曡祫閲戞祦鍔ㄧ殑璐﹀彿鏁伴噺锛�
- long loseUser = userInfoCountService.countLoseUser(180);
- // 绱鏈夎喘涔扮敤鎴锋暟
- long orderUser = userInfoCountService.countHasOrderUser();
-
- data.put("totalUser", totalUser);
- data.put("loseUser", loseUser);
- data.put("orderUser", orderUser);
// 浠婃棩鏂板鐢ㄦ埛鏁伴噺
long todayUser = userInfoCountService.countNewUser(1, null);
@@ -1262,20 +1296,25 @@
try {
- List<AccountDetails> detailsList = accountDetailsService.findAccountDetailsList(uid, pageIndex);
- if (detailsList == null || detailsList.size() == 0) {
+ List<UserMoneyDetail> userMoneyDetailsList = userMoneyDetailService.listByUidWithState(uid, pageIndex,
+ pageSize);
+ if (userMoneyDetailsList == null || userMoneyDetailsList.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
- int count = accountDetailsService.getCount(uid);
+ List<AccountDetails> detailList = new ArrayList<>();
+ for (UserMoneyDetail detail : userMoneyDetailsList)
+ detailList.add(AccountDetailsFactory.create(detail));
+
+ long count = userMoneyDetailService.countByUidWithState(uid);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
JSONObject data = new JSONObject();
data.put("pe", pe);
- data.put("result_list", GsonUtil.toJsonExpose(detailsList));
+ data.put("result_list", GsonUtil.toJsonExpose(detailList));
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
@@ -1587,4 +1626,84 @@
}
}
+
+ /**
+ * 鏌ヨ灏佺
+ * @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("鎿嶄綔寮傚父"));
+ }
+ }
+
+
+ /**
+ * 鐢ㄦ埛璐﹀彿- 灏佺/瑙ｅ皝
+ * @param callback
+ * @param code
+ * @param type 1("寰俊unionId"), 2("娣樺疂ID"), 3("鎵嬫満鍙�"), 4("鏀粯瀹濊处鍙�");
+ * @param out
+ */
+ @RequestMapping(value = "saveForbiddenInfo")
+ public void saveForbiddenInfo(String callback, String code, Integer type, boolean state, PrintWriter out) {
+ try {
+ if (code == null || code.trim().length() == 0 || type == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍙傛暟涓嶈兘涓虹┖"));
+ }
+
+ forbiddenUserIdentifyCodeService.saveForbiddenInfo(code, type, state);
+
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇敼鎴愬姛"));
+
+ } catch (ForbiddenUserIdentifyCodeException e) {
+ e.printStackTrace();
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ e.printStackTrace();
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+ }
+
+ }
+
}
--
Gitblit v1.8.0