From 48a204f4c90a80c0bb4e5ba1f9f0f42939cadba8 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 01 一月 2020 10:19:34 +0800 Subject: [PATCH] 用户资金记录bug修改,京东,拼多多小程序商品转链 --- fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 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 9a5efe1..4932359 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 @@ -54,6 +54,7 @@ import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.TimeUtil; +import com.yeshi.fanli.util.annotation.RequestSerializableByKey; import com.yeshi.fanli.vo.user.UserGoldCoinVO; import com.yeshi.fanli.vo.user.UserInfoVO; @@ -123,7 +124,7 @@ * @param out */ @RequestMapping(value = "query") - public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer keyType, Integer rank, + 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, PrintWriter out) { try { @@ -173,14 +174,14 @@ } List<UserInfoVO> userList = userInfoService.query((pageIndex - 1) * pageSize, pageSize, type, key, keyType, - userRank, days, startTime, endTime, orderField, orderMode); + userRank, days, startTime, endTime, orderField, orderMode,userType); if (userList == null || userList.size() == 0) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐩稿叧鏁版嵁")); return; } - long count = userInfoService.queryCount(type, key, keyType, userRank, days, startTime, endTime); + long count = userInfoService.queryCount(type, key, keyType, userRank, days, startTime, endTime,userType); int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1); PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage); @@ -1253,13 +1254,16 @@ beginDate = TimeUtil.parse(startTime); endDate = TimeUtil.parse(endTime); } else if (dateType == 2) { - Calendar calendar=Calendar.getInstance(); - int currentYear = calendar.get(Calendar.YEAR); - - calendar.clear(); - calendar.set(Calendar.YEAR, currentYear); - beginDate =calendar.getTime(); - + 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.clear(); calendar.set(Calendar.YEAR, currentYear); calendar.roll(Calendar.DAY_OF_YEAR, -1); @@ -1370,6 +1374,7 @@ * @param out * @param request */ + @RequestSerializableByKey(key = "'passVIP-' +#id") @RequestMapping(value = "passVIP") public void passVIP(String callback, Long id, PrintWriter out, HttpServletRequest request) { try { @@ -1386,6 +1391,7 @@ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg())); return; } catch (Exception e) { + e.printStackTrace(); JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触")); return; } @@ -1410,8 +1416,6 @@ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄�")); return; } - // 缂栫爜杞崲 - reason = URLDecoder.decode(reason, "UTF-8"); userVIPInfoService.rejectVIPApply(id, reason); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎷掔粷鎴愬姛")); LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "][绠$悊鍛�:" + admin.getName() + "] 鎷掔粷鎻愮幇id=" + id + "鐨勫崌绾ц秴绾т細鍛樼敵璇蜂笉瀛樺湪!"); @@ -1419,6 +1423,7 @@ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg())); return; } catch (Exception e) { + e.printStackTrace(); JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触")); return; } -- Gitblit v1.8.0