From 52bc8ff0de3c7538d1401423c1cba9615c0c2082 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 18 六月 2020 17:22:24 +0800
Subject: [PATCH] 发圈商品来源修改 + 云发单规则调整
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java | 532 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 287 insertions(+), 245 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 8317664..688c866 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
@@ -115,61 +115,54 @@
@Resource
private UserAccountService userAccountService;
-
+
@Resource
private UserActiveLogService userActiveLogService;
-
+
@Resource
private UserVIPInfoService userVIPInfoService;
-
+
@Resource
private IntegralDetailService integralDetailService;
-
+
@Resource
private UserInviteValidNumService userInviteValidNumService;
-
+
@Resource
private ThreeSaleSerivce threeSaleSerivce;
-
+
@Resource
private ExtractService extractService;
-
+
@Resource
private HongBaoV2Service hongBaoV2Service;
-
+
@Resource
private TearcherService tearcherService;
-
+
@Resource
private ThreeSaleDetailService threeSaleDetailService;
-
+
@Resource
private HongBaoV2CountService hongBaoV2CountService;
-
-
+
/**
* 鏌ヨ鐢ㄦ埛淇℃伅鍒楄〃 姝ｅ父鐢ㄦ埛/寮傚父鐢ㄦ埛
*
* @param callback
* @param pageIndex
- * @param key
- * 鏌ヨ鏉′欢
- * @param userType
- * 鐢ㄦ埛绫诲瀷锛氶噾鍐犮�侀摱鍐犮�侀摐鍐�
- * @param days
- * 鏌ヨ澶╂暟
- * @param startTime
- * 娉ㄥ唽鏃堕棿
- * @param endTime
- * 娉ㄥ唽鏃堕棿
- * @param orderMode
- * 鎺掑簭鏂瑰紡 璁㈠崟鏁伴噺 浠婃棩璁㈠崟 绱闃熷憳
+ * @param key 鏌ヨ鏉′欢
+ * @param userType 鐢ㄦ埛绫诲瀷锛氶噾鍐犮�侀摱鍐犮�侀摐鍐�
+ * @param days 鏌ヨ澶╂暟
+ * @param startTime 娉ㄥ唽鏃堕棿
+ * @param endTime 娉ㄥ唽鏃堕棿
+ * @param orderMode 鎺掑簭鏂瑰紡 璁㈠崟鏁伴噺 浠婃棩璁㈠崟 绱闃熷憳
* @param out
*/
@RequestMapping(value = "query")
- public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer keyType, Integer rank,Integer userType,
- Integer days, String startTime, String endTime, Integer orderMode, Integer type,String level,
- Integer activeCode, PrintWriter out) {
+ public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer keyType, Integer rank,
+ Integer userType, Integer days, String startTime, String endTime, Integer orderMode, Integer type,
+ String level, Integer activeCode, PrintWriter out) {
try {
if (type == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛绫诲瀷type涓嶈兘涓虹┖"));
@@ -217,14 +210,15 @@
}
List<UserInfoVO> userList = userInfoService.query((pageIndex - 1) * pageSize, pageSize, type, key, keyType,
- userRank, days, startTime, endTime, orderField, orderMode,userType, level, activeCode);
+ userRank, days, startTime, endTime, orderField, orderMode, userType, level, activeCode);
if (userList == null || userList.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐩稿叧鏁版嵁"));
return;
}
- long count = userInfoService.queryCount(type, key, keyType, userRank, days, startTime, endTime,userType, level, activeCode);
+ long count = userInfoService.queryCount(type, key, keyType, userRank, days, startTime, endTime, userType,
+ level, activeCode);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -245,6 +239,7 @@
/**
* 鐢ㄦ埛鍩虹淇℃伅鏌ヨ
+ *
* @param callback
* @param pageIndex
* @param pageSize
@@ -261,8 +256,8 @@
* @param out
*/
@RequestMapping(value = "queryInfo")
- public void queryInfo(String callback, Integer pageIndex, Integer pageSize, String key, Integer keyType, Integer rank,Integer userType,
- Integer days, String startTime, String endTime, Integer state,String level,
+ public void queryInfo(String callback, Integer pageIndex, Integer pageSize, String key, Integer keyType,
+ Integer rank, Integer userType, Integer days, String startTime, String endTime, Integer state, String level,
Integer activeCode, PrintWriter out) {
try {
if (pageIndex == null)
@@ -291,15 +286,16 @@
}
}
- List<UserInfoVO> userList = userInfoService.queryInfo((pageIndex - 1) * pageSize, pageSize, state, key, keyType,
- userRank, days, startTime, endTime, userType, level, activeCode);
+ List<UserInfoVO> userList = userInfoService.queryInfo((pageIndex - 1) * pageSize, pageSize, state, key,
+ keyType, userRank, days, startTime, endTime, userType, level, activeCode);
if (userList == null || userList.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐩稿叧鏁版嵁"));
return;
}
- long count = userInfoService.countInfo(state, key, keyType, userRank, days, startTime, endTime,userType, level, activeCode);
+ long count = userInfoService.countInfo(state, key, keyType, userRank, days, startTime, endTime, userType,
+ level, activeCode);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -317,10 +313,10 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
}
}
-
-
+
/**
* 璧勯噾缁熻
+ *
* @param callback
* @param uid
* @param out
@@ -333,7 +329,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ョ敤鎴稩D涓嶅瓨鍦�"));
return;
}
-
+
Date minDate = null;
Date maxDate = null;
long timeStamp = System.currentTimeMillis();
@@ -349,16 +345,16 @@
minDate = new Date(0L);
maxDate = new Date(timeStamp);
// 绱鎴愬姛鎻愮幇
- BigDecimal totalExtractMoney = userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate,
- maxDate, 1).abs();
+ BigDecimal totalExtractMoney = userMoneyDetailService
+ .statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate, 1).abs();
// 鎻愮幇涓噾棰�
BigDecimal extractingMoney = extractService.sumVerifyingMoney(uid);
-
+
// 鍏ㄩ儴鏈埌璐�
minDate = new Date(0);
maxDate = new Date(timeStamp);
BigDecimal unRecievedMoney = hongBaoV2Service.getUnRecievedMoneyWithCreateTime(uid, minDate, maxDate);
-
+
JSONObject data = new JSONObject();
data.put("totalExtractMoney", totalExtractMoney);
data.put("extractingMoney", extractingMoney);
@@ -370,10 +366,10 @@
e.printStackTrace();
}
}
-
-
+
/**
* 鏉冪泭缁熻
+ *
* @param callback
* @param uid
* @param out
@@ -386,20 +382,19 @@
if (userInfoExtra != null) {
goldCoin = userInfoExtra.getGoldCoin();
}
-
+
JSONObject data = new JSONObject();
data.put("goldCoin", goldCoin);
- data.put("exchangeGoldCoin",new BigDecimal(integralDetailService.sumUseGoldCoin(uid)).abs());
+ data.put("exchangeGoldCoin", new BigDecimal(integralDetailService.sumUseGoldCoin(uid)).abs());
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
e.printStackTrace();
}
}
-
-
+
/**
- * 鐢ㄦ埛绮変笣缁熻
+ * 鐢ㄦ埛绮変笣缁熻
*
* @param callback
* @param pageIndex
@@ -410,23 +405,23 @@
@RequestMapping(value = "countTeamFans")
public void countTeamFans(String callback, Long uid, PrintWriter out) {
JSONObject data = new JSONObject();
-
+
// 瀵煎笀
String tearcherName = "";
TearcherInfo tearcherInfo = tearcherService.selectByUid(uid);
if (tearcherInfo != null) {
tearcherName = tearcherInfo.getNickName();
}
- data.put("tearcherName", tearcherName);
-
+ data.put("tearcherName", tearcherName);
+
// 閭�璇蜂汉
String bossName = "";
UserInfo boss = threeSaleSerivce.getBoss(uid);
if (boss != null) {
- bossName = boss.getNickName();
+ bossName = boss.getNickName();
}
- data.put("bossName", bossName);
-
+ data.put("bossName", bossName);
+
// 閭�璇风矇涓�
int doneFirst = 0;
int doneSecond = 0;
@@ -435,76 +430,77 @@
doneFirst = userInviteValidNum.getNumFirst() == null ? 0 : userInviteValidNum.getNumFirst();
doneSecond = userInviteValidNum.getNumSecond() == null ? 0 : userInviteValidNum.getNumSecond();
}
- data.put("doneFirst", doneFirst);
- data.put("doneSecond", doneSecond);
-
+ data.put("doneFirst", doneFirst);
+ data.put("doneSecond", doneSecond);
+
// 涔濅唬绮変笣鏁伴噺
- data.put("nineFans", threeSaleDetailService.countByBossUidAndMaxLevel(uid, 9));
-
+ data.put("nineFans", threeSaleDetailService.countByBossUidAndMaxLevel(uid, 9));
+
// 鏈夋晥绮変笣
- data.put("first", threeSaleSerivce.countFirstTeam(uid));
- data.put("second", threeSaleSerivce.countSecondTeam(uid));
+ data.put("first", threeSaleSerivce.countFirstTeam(uid));
+ data.put("second", threeSaleSerivce.countSecondTeam(uid));
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
}
-
-
-
+
/**
* 鐢ㄦ埛璇︾粏淇℃伅
+ *
* @param callback
* @param uid
* @param out
*/
@RequestMapping(value = "getInfoDetail")
public void getInfoDetail(String callback, Long uid, PrintWriter out) {
-
- UserInfo user = userInfoService.getUserByIdWithMybatis(uid);
+
+ UserInfo user = userInfoService.selectByPKey(uid);
UserInfoVO userInfoVO = new UserInfoVO();
+ userInfoVO.setId(uid);
userInfoVO.setPhone(user.getPhone());
userInfoVO.setState(user.getState());
userInfoVO.setCreatetime(user.getCreatetime());
-
+
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
if (userInfoExtra != null) {
if (!StringUtil.isNullOrEmpty(userInfoExtra.getMark())) {
- userInfoVO.setMark( userInfoExtra.getMark());
+ userInfoVO.setMark(userInfoExtra.getMark());
}
userInfoVO.setInviteCode(userInfoExtra.getInviteCode());
userInfoVO.setInviteCodeVip(userInfoExtra.getInviteCodeVip());
+ userInfoVO.setWxId(userInfoExtra.getWeiXin());
}
-
+
// 鏈�杩戜竴娆′笅鍗曟椂闂�
Date lastOrderTime = hongBaoV2CountService.getLastHongBaoTime(uid);
if (lastOrderTime != null) {
userInfoVO.setLastOrderTime(lastOrderTime.getTime());
}
-
+
// 鏈�杩戠櫥褰曟椂闂�
UserActiveLog userActiveLog = userActiveLogService.getUserLatestActiveInfo(uid);
if (userActiveLog != null) {
userInfoVO.setLastLoginTime(userActiveLog.getCreateTime().getTime());
}
-
+
// 鏄剧ず鐢ㄦ埛寰俊 娣樺疂 鑰佺増鏈瓨鍦�
- String wxUnionId = user.getWxUnionId();
- if (wxUnionId == null || wxUnionId.trim().length() == 0) {
- user.setWxName(null);
+ String wxId = userInfoVO.getWxId();
+ if (wxId == null) {
+ userInfoVO.setWxId("");
}
- user.setWxName(user.getWxUnionId());
-
// 鏄惁缁戝畾鏀粯瀹濓紙璐拱 + 鍒嗕韩鏉冮檺锛�
UserExtraTaoBaoInfo extraTaoBaoInfo = userExtraTaoBaoInfoService.getByUid(uid);
- String taoBaoUid = extraTaoBaoInfo.getTaoBaoUid();
- String specialId = extraTaoBaoInfo.getSpecialId();
- String relationId = extraTaoBaoInfo.getRelationId();
- if (StringUtil.isNullOrEmpty(taoBaoUid) || StringUtil.isNullOrEmpty(specialId)
- || StringUtil.isNullOrEmpty(relationId)) {
- userInfoVO.setTbName(null);
- userInfoVO.setTaoBaoUid(null);
- } else {
- userInfoVO.setTbName(extraTaoBaoInfo.getTaoBaoNickName());
- userInfoVO.setTaoBaoUid(extraTaoBaoInfo.getTaoBaoUid());
+ if (extraTaoBaoInfo != null) {
+ String taoBaoUid = extraTaoBaoInfo.getTaoBaoUid();
+ String specialId = extraTaoBaoInfo.getSpecialId();
+ String relationId = extraTaoBaoInfo.getRelationId();
+ if (StringUtil.isNullOrEmpty(taoBaoUid) || StringUtil.isNullOrEmpty(specialId)
+ || StringUtil.isNullOrEmpty(relationId)) {
+ userInfoVO.setTbName(null);
+ userInfoVO.setTaoBaoUid(null);
+ } else {
+ userInfoVO.setTbName(extraTaoBaoInfo.getTaoBaoNickName());
+ userInfoVO.setTaoBaoUid(extraTaoBaoInfo.getTaoBaoUid());
+ }
}
/* 缁戝畾鏀舵璐﹀彿淇℃伅 */
@@ -528,6 +524,82 @@
}
+ /**
+ * 缁戝畾璇︽儏
+ *
+ * @param callback
+ * @param uid
+ * @param out
+ */
+ @RequestMapping(value = "getBindDetail")
+ public void getBindDetail(String callback, Long uid, PrintWriter out) {
+ UserInfo user = userInfoService.selectByPKey(uid);
+
+ JSONObject data = new JSONObject();
+
+ Integer state = user.getState();
+ if (state == UserInfo.STATE_FORBIDDEN) {
+ data.put("state", false);
+ } else {
+ data.put("state", true);
+ }
+
+ data.put("phone", user.getPhone());
+
+ // 寰俊鎺堟潈
+ String wxUnionId = user.getWxUnionId();
+ if(StringUtil.isNullOrEmpty(wxUnionId)) {
+ data.put("wxName", "");
+ data.put("wxState", false);
+ } else {
+ data.put("wxName", user.getWxName());
+ data.put("wxnState", true);
+ }
+
+ String mark = "";
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ if (userInfoExtra != null) {
+ if (!StringUtil.isNullOrEmpty(userInfoExtra.getMark())) {
+ mark = userInfoExtra.getMark();
+ }
+ }
+ data.put("mark", mark);
+
+
+ // 娣樺疂鎺堟潈
+ String tbName = "";
+ boolean tbState = false;
+ UserExtraTaoBaoInfo extraTaoBaoInfo = userExtraTaoBaoInfoService.getByUid(uid);
+ if (extraTaoBaoInfo != null) {
+ String taoBaoUid = extraTaoBaoInfo.getTaoBaoUid();
+ String specialId = extraTaoBaoInfo.getSpecialId();
+ String relationId = extraTaoBaoInfo.getRelationId();
+ if (!StringUtil.isNullOrEmpty(taoBaoUid) && StringUtil.isNullOrEmpty(specialId) && StringUtil.isNullOrEmpty(relationId)) {
+ tbState = true;
+ tbName = extraTaoBaoInfo.getTaoBaoNickName();
+ }
+ }
+ data.put("tbName", tbName);
+ data.put("tbState", tbState);
+
+ /* 缁戝畾鏀舵璐﹀彿淇℃伅 */
+ String accountName = "";
+ boolean accountState = false;
+ List<BindingAccount> account = bindingAccountService.getBindingAccountByUid(uid);
+ if (account != null && account.size() > 0) {
+ BindingAccount bindingAccount = account.get(0);
+ Integer type = bindingAccount.getType();
+ // 鏀粯瀹�
+ if (type != null && type == 1) {
+ accountState = true;
+ accountName = bindingAccount.getName();
+ }
+ }
+ data.put("accountName", accountName);
+ data.put("accountState", accountState);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ }
+
/**
* 缁熻浠婃棩鐢ㄦ埛鎬绘儏鍐�
*
@@ -590,13 +662,11 @@
* // 缁熻鎵�鏈夋�婚噾棰� BigDecimal countTotalMoney =
* userInfoCountService.countAllMoney(null);
*
- * // 缁熻鎵�鏈夊彲鎻愮幇閲戦 String minMoney =
- * configService.get(Constant.EXTRACT_MIN_MONEY); if (minMoney ==
- * null) { minMoney = "20"; } double min =
+ * // 缁熻鎵�鏈夊彲鎻愮幇閲戦 String minMoney = configService.get(Constant.EXTRACT_MIN_MONEY);
+ * if (minMoney == null) { minMoney = "20"; } double min =
* Double.parseDouble(minMoney); BigDecimal countCanAssets =
- * userInfoCountService.countAllMoney(min);
- * data.put("countTotalMoney", countTotalMoney);
- * data.put("countCanAssets", countCanAssets);
+ * userInfoCountService.countAllMoney(min); data.put("countTotalMoney",
+ * countTotalMoney); data.put("countCanAssets", countCanAssets);
*/
// 浠婃棩鏂板鐢ㄦ埛鏁伴噺
@@ -615,10 +685,8 @@
/**
*
* @param data
- * @param uid
- * 鐢ㄦ埛ID
- * @param type
- * 闇�瑕佽В缁戠殑璐︽埛绫诲瀷
+ * @param uid 鐢ㄦ埛ID
+ * @param type 闇�瑕佽В缁戠殑璐︽埛绫诲瀷
*/
@RequestMapping("unBindUserInfo")
public void unBindUserInfo(String callback, Long uid, String typeArray, PrintWriter out) {
@@ -694,11 +762,10 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
}
}
-
-
/**
* 淇敼鐢ㄦ埛澶囨敞
+ *
* @param callback
* @param uid
* @param mark
@@ -710,7 +777,7 @@
if (uid == null || uid <= 0 || StringUtil.isNullOrEmpty(mark))
return;
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
- if (userInfoExtra == null)
+ if (userInfoExtra == null)
return;
UserInfoExtra updateExtra = new UserInfoExtra();
updateExtra.setId(userInfoExtra.getId());
@@ -723,35 +790,37 @@
/**
* 鍒犻櫎鐢ㄦ埛-鏀瑰彉鍏剁姸鎬�
+ *
* @param callback
* @param idArray
* @param out
*/
@RequestMapping(value = "deleteUser")
- public void delete(String callback, String idArray, HttpServletRequest request, PrintWriter out) {
+ public void delete(String callback, String idArray, HttpServletRequest request, PrintWriter out) {
try {
AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
if (admin == null) {
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄嗐��")));
return;
}
-
+
if (StringUtil.isNullOrEmpty(idArray)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
return;
}
Gson gson = new Gson();
- List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {}.getType());
+ List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {
+ }.getType());
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈娴嬪埌鍒犻櫎鐨勬暟鎹�"));
return;
}
-
- for (Long id: list) {
+
+ for (Long id : list) {
UserInfo user = new UserInfo(id);
user.setState(UserInfo.STATE_DELETE);
- user.setStateDesc(admin.getId()+" " + admin.getName()+ "鍚庡彴鎵嬪姩鍒犻櫎");
+ user.setStateDesc(admin.getId() + " " + admin.getName() + "鍚庡彴鎵嬪姩鍒犻櫎");
userInfoService.updateByPrimaryKeySelective(user);
}
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎"));
@@ -760,9 +829,7 @@
e.printStackTrace();
}
}
-
-
-
+
/**
* 灏佺鐢ㄦ埛ID
*
@@ -867,8 +934,7 @@
*
* @param callback
* @param code
- * @param type
- * 1("寰俊unionId"), 2("娣樺疂ID"), 3("鎵嬫満鍙�"), 4("鏀粯瀹濊处鍙�");
+ * @param type 1("寰俊unionId"), 2("娣樺疂ID"), 3("鎵嬫満鍙�"), 4("鏀粯瀹濊处鍙�");
* @param out
*/
@RequestMapping(value = "saveForbiddenInfo")
@@ -889,8 +955,6 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
}
}
-
-
/**
* 闃熷憳鍏崇郴
@@ -952,11 +1016,10 @@
// 鐢ㄦ埛淇℃伅
UserInfo boss = threeSale.getBoss();
threeSale.setBoss(userInfoService.selectByPKey(boss.getId()));
-
+
UserInfo worker = threeSale.getWorker();
threeSale.setWorker(userInfoService.selectByPKey(worker.getId()));
-
-
+
Integer expire = threeSale.getExpire();
if (threeSale.getState()) {
threeSale.setExpire(1); // 閭�璇锋垚鍔�
@@ -968,7 +1031,6 @@
}
}
}
-
long count = 0;
if (type == 0) {
@@ -1048,16 +1110,11 @@
/**
* 鏍规嵁娓犻亾 缁熻褰撴棩鏂板鐢ㄦ埛鏁伴噺
*
- * @param channelArray
- * 鍚嶅瓧鏁扮粍
- * @param dateType
- * 绫诲瀷 1鏃� 2鏈� 3骞�
- * @param year
- * 2018
- * @param startTime
- * 2018-12-01
- * @param endTime
- * 2018-12-01
+ * @param channelArray 鍚嶅瓧鏁扮粍
+ * @param dateType 绫诲瀷 1鏃� 2鏈� 3骞�
+ * @param year 2018
+ * @param startTime 2018-12-01
+ * @param endTime 2018-12-01
* @param out
*/
@RequestMapping(value = "getNewUserCharts")
@@ -1069,7 +1126,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));
return;
}
-
+
if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
startTime = null;
endTime = null;
@@ -1077,40 +1134,40 @@
Date beginDate = null;
Date endDate = null;
-
+
if (dateType == 1) {
beginDate = TimeUtil.parse(startTime);
endDate = TimeUtil.parse(endTime);
} else if (dateType == 2) {
- Calendar calendar=Calendar.getInstance();
+ Calendar calendar = Calendar.getInstance();
int currentYear = calendar.get(Calendar.YEAR);
if (!StringUtil.isNullOrEmpty(year)) {
currentYear = Integer.parseInt(year);
}
calendar.clear();
- calendar.set(Calendar.YEAR, currentYear);
- beginDate =calendar.getTime();
-
+ calendar.set(Calendar.YEAR, currentYear);
+ beginDate = calendar.getTime();
+
calendar.clear();
calendar.set(Calendar.YEAR, currentYear);
calendar.roll(Calendar.DAY_OF_YEAR, -1);
- endDate=calendar.getTime();
+ endDate = calendar.getTime();
} else if (dateType == 3) {
beginDate = TimeUtil.parse("2018-01-01");
endDate = new Date();
}
Gson gson = new Gson();
List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
-
+
// 娓犻亾
List<String> channelList = null;
if (channelArray != null && channelArray.trim().length() > 0) {
channelList = gson.fromJson(channelArray, new TypeToken<ArrayList<String>>() {
}.getType());
}
-
+
JSONArray line_list = new JSONArray();
-
+
if (channelList != null && channelList.size() > 0) {
for (String channel : channelList) {
List<Object> list = getNewUserData(dateList, dateType, beginDate, endDate, channel);
@@ -1136,35 +1193,35 @@
e.printStackTrace();
}
}
-
-
- private List<Object> getNewUserData(List<String> dateList, Integer dateType, Date beginDate, Date endDate, String channel) {
+
+ private List<Object> getNewUserData(List<String> dateList, Integer dateType, Date beginDate, Date endDate,
+ String channel) {
List<Object> list = new ArrayList<>();
List<CountUserInfo> listHistory = userInfoCountService.getNewUserData(beginDate, endDate, channel);
- for (String date: dateList) {
+ for (String date : dateList) {
int value = 0;
if (listHistory != null) {
- for (CountUserInfo history: listHistory) {
+ for (CountUserInfo history : listHistory) {
if (dateType == 1) {
String gernalTime = TimeUtil.getGernalTime(history.getDay().getTime());
if (gernalTime.equalsIgnoreCase(date)) {
value += history.getNum();
continue;
}
- } else if (dateType == 2){
+ } else if (dateType == 2) {
String gernalTime = TimeUtil.getMonthOnlyMM(history.getDay());
- if(gernalTime.startsWith("0")) {
+ if (gernalTime.startsWith("0")) {
gernalTime = gernalTime.substring(1, 2);
}
-
+
if (gernalTime.equalsIgnoreCase(date)) {
- value += history.getNum();
+ value += history.getNum();
continue;
}
} else if (dateType == 3) {
String gernalTime = TimeUtil.getYearOnlyYYYY(history.getDay());
if (gernalTime.equalsIgnoreCase(date)) {
- value += history.getNum();
+ value += history.getNum();
continue;
}
}
@@ -1172,23 +1229,18 @@
}
list.add(value + "");
}
-
+
return list;
}
/**
* 鏍规嵁娓犻亾 缁熻褰撴棩鏂板鐢ㄦ埛鏁伴噺
*
- * @param channelArray
- * 鍚嶅瓧鏁扮粍
- * @param dateType
- * 绫诲瀷 1鏃� 2鏈� 3骞�
- * @param year
- * 2018
- * @param startTime
- * 2018-12-01
- * @param endTime
- * 2018-12-01
+ * @param channelArray 鍚嶅瓧鏁扮粍
+ * @param dateType 绫诲瀷 1鏃� 2鏈� 3骞�
+ * @param year 2018
+ * @param startTime 2018-12-01
+ * @param endTime 2018-12-01
* @param out
*/
@RequestMapping(value = "getTodayBuyRate")
@@ -1252,8 +1304,7 @@
JSONArray line_list = new JSONArray();
for (String channel : channelList) {
- List<ChartTDO> list = userInfoCountService.getTodayBuyRate(channel, dateType, year,
- startTime, endTime);
+ List<ChartTDO> list = userInfoCountService.getTodayBuyRate(channel, dateType, year, startTime, endTime);
if ("all".equalsIgnoreCase(channel)) {
channel = "鎬昏";
@@ -1299,12 +1350,10 @@
* 褰撳懆浜х敓3鍗曠殑鏂板鐢ㄦ埛姒傜巼
*
* @param callback
- * @param channelArray
- * 娓犻亾鍚嶇О
+ * @param channelArray 娓犻亾鍚嶇О
* @param startTime
* @param endTime
- * @param orderNum
- * 璁㈠崟鏁伴噺
+ * @param orderNum 璁㈠崟鏁伴噺
* @param out
*/
@RequestMapping(value = "getWeekBuyRate")
@@ -1365,9 +1414,9 @@
}
}
-
/**
* 鑾峰彇閲戝竵鎺掕姒�
+ *
* @param callback
* @param pageIndex
* @param pageSize
@@ -1381,13 +1430,13 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("type涓嶈兘涓虹┖"));
return;
}
-
+
if (pageIndex == null)
pageIndex = 1;
if (pageSize == null)
pageSize = 50;
-
+
long count = 0;
List<UserGoldCoinVO> list = null;
if (type == 0) {
@@ -1397,10 +1446,9 @@
count = userInfoCountService.countByUserGoldCoin(type, key);
list = userInfoCountService.listByUserGoldCoin((pageIndex - 1) * pageSize, pageSize, type, key);
}
-
- if(list == null)
+
+ if (list == null)
list = new ArrayList<>();
-
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -1410,10 +1458,10 @@
data.put("list", list);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
}
-
-
+
/**
* 鑾峰彇閲戝竵鎺掕姒�
+ *
* @param callback
* @param pageIndex
* @param pageSize
@@ -1421,20 +1469,20 @@
* @param out
*/
@RequestMapping(value = "getGoldCoinRecord")
- public void getGoldCoinRecord(String callback, Integer pageIndex, Integer pageSize, String key, PrintWriter out) {
+ public void getGoldCoinRecord(String callback, Integer pageIndex, Integer pageSize, String key, PrintWriter out) {
if (pageIndex == null)
pageIndex = 1;
-
+
if (pageSize == null)
pageSize = 20;
-
- List<IntegralDetail> list = integralDetailService.listQuery((pageIndex-1)* pageSize, pageSize, key);
+
+ List<IntegralDetail> list = integralDetailService.listQuery((pageIndex - 1) * pageSize, pageSize, key);
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐩稿叧淇℃伅"));
return;
}
-
- for (IntegralDetail integralDetail: list) {
+
+ for (IntegralDetail integralDetail : list) {
Long uid = integralDetail.getUid();
UserInfo userInfo = userInfoService.getUserById(uid);
if (userInfo != null) {
@@ -1442,42 +1490,40 @@
integralDetail.setPortrait(userInfo.getPortrait());
}
}
-
+
long count = integralDetailService.countQuery(key);
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.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
-
JSONObject data = new JSONObject();
data.put("pe", pe);
data.put("list", gson.toJson(list));
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
}
-
-
-
+
/**
*
* @param callback
* @param pageIndex
* @param pageSize
- * @param key 鎼滅储锛氭殏鍙彁渚泆id
- * @param state 鐘舵�侊細
+ * @param key 鎼滅储锛氭殏鍙彁渚泆id
+ * @param state 鐘舵�侊細
* @param out
*/
@RequestMapping(value = "queryVip")
- public void queryVip(String callback, Integer pageIndex, Integer pageSize, String key, Integer state, PrintWriter out) {
+ public void queryVip(String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
+ PrintWriter out) {
try {
List<UserVIPInfo> list = userVIPInfoService.listQuery(pageIndex, pageSize, key, state);
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
-
+
long count = userVIPInfoService.countQuery(key, state);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -1496,10 +1542,9 @@
}
}
-
-
/**
* 瓒呯骇浼氬憳鍗囩骇閫氳繃
+ *
* @param callback
* @param id
* @param out
@@ -1507,7 +1552,7 @@
*/
@RequestSerializableByKey(key = "'passVIP-' +#id")
@RequestMapping(value = "passVIP")
- public void passVIP(String callback, Long id, PrintWriter out, HttpServletRequest request) {
+ public void passVIP(String callback, Long id, PrintWriter out, HttpServletRequest request) {
try {
/* 妫�楠屾槸鍚︾櫥闄� */
AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
@@ -1517,39 +1562,8 @@
}
userVIPInfoService.passVIPApply(id);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
- LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "閫氳繃浜哰id=" + id + "]鐨勫崌绾ц秴绾т細鍛樼敵璇�!");
- } catch (UserVIPInfoException e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
- return;
- } catch (Exception e) {
- e.printStackTrace();
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
- return;
- }
- }
-
-
- /**
- * 瓒呯骇浼氬憳鍗囩骇鎷掔粷
- * @param callback
- * @param id
- * @param reason
- * @param out
- * @param request
- */
-
- @RequestMapping(value = "rejectVIP")
- public void rejectVIP(String callback, Long id, String reason, PrintWriter out, HttpServletRequest request) {
- try {
- /* 妫�楠屾槸鍚︾櫥闄� */
- AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
- if (admin == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄�"));
- return;
- }
- userVIPInfoService.rejectVIPApply(id, reason);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎷掔粷鎴愬姛"));
- LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "][绠＄悊鍛�:" + admin.getName() + "] 鎷掔粷鎻愮幇id=" + id + "鐨勫崌绾ц秴绾т細鍛樼敵璇蜂笉瀛樺湪!");
+ LogHelper.userInfo(
+ "[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "閫氳繃浜哰id=" + id + "]鐨勫崌绾ц秴绾т細鍛樼敵璇�!");
} catch (UserVIPInfoException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
return;
@@ -1560,8 +1574,39 @@
}
}
-
-
+ /**
+ * 瓒呯骇浼氬憳鍗囩骇鎷掔粷
+ *
+ * @param callback
+ * @param id
+ * @param reason
+ * @param out
+ * @param request
+ */
+
+ @RequestMapping(value = "rejectVIP")
+ public void rejectVIP(String callback, Long id, String reason, PrintWriter out, HttpServletRequest request) {
+ try {
+ /* 妫�楠屾槸鍚︾櫥闄� */
+ AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
+ if (admin == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄�"));
+ return;
+ }
+ userVIPInfoService.rejectVIPApply(id, reason);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎷掔粷鎴愬姛"));
+ LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "][绠＄悊鍛�:" + admin.getName() + "] 鎷掔粷鎻愮幇id=" + id
+ + "鐨勫崌绾ц秴绾т細鍛樼敵璇蜂笉瀛樺湪!");
+ } catch (UserVIPInfoException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ return;
+ } catch (Exception e) {
+ e.printStackTrace();
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ return;
+ }
+ }
+
/**
* 鐢ㄦ埛璐︽埛鏄庣粏
*
@@ -1583,14 +1628,14 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
-
- for (UserMoneyDetail detail: list) {
+
+ for (UserMoneyDetail detail : list) {
UserInfo userInfo = detail.getUserInfo();
if (userInfo == null) {
detail.setUserInfo(new UserInfo());
continue;
}
-
+
UserInfo user = userInfoService.selectByPKey(userInfo.getId());
if (user != null) {
detail.setUserInfo(user);
@@ -1600,20 +1645,22 @@
long count = userMoneyDetailService.countQuery(key, keyType);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
-
+
GsonBuilder gsonBuilder = new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss");
- gsonBuilder.registerTypeAdapter(UserMoneyDetailTypeEnum.class, new JsonSerializer<UserMoneyDetailTypeEnum>() {
- @Override
- public JsonElement serialize(UserMoneyDetailTypeEnum value, Type theType, JsonSerializationContext context) {
- if (value == null) {
- return new JsonPrimitive("");
- } else {
- return new JsonPrimitive(value.getDesc());
- }
- }
- });
+ gsonBuilder.registerTypeAdapter(UserMoneyDetailTypeEnum.class,
+ new JsonSerializer<UserMoneyDetailTypeEnum>() {
+ @Override
+ public JsonElement serialize(UserMoneyDetailTypeEnum value, Type theType,
+ JsonSerializationContext context) {
+ if (value == null) {
+ return new JsonPrimitive("");
+ } else {
+ return new JsonPrimitive(value.getDesc());
+ }
+ }
+ });
Gson gson = gsonBuilder.create();
-
+
JSONObject data = new JSONObject();
data.put("pe", pe);
data.put("result_list", gson.toJson(list));
@@ -1623,10 +1670,5 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
}
}
-
-
-
-
-
}
--
Gitblit v1.8.0