帮助中心

yujian

2019-12-19 626d711cb15896055c13fe344eb7fcc824589715

 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;



@@ -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;

      }