From be67478cae6bf9308f15949a21e7d0a57a3f0ecb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 七月 2020 15:37:31 +0800
Subject: [PATCH] dubbo集成修改
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/user/vip/UserVipApplyAdminController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/user/vip/UserVipApplyAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/user/vip/UserVipApplyAdminController.java
index 339643d..81853f4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/user/vip/UserVipApplyAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/user/vip/UserVipApplyAdminController.java
@@ -7,6 +7,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.IPUtil;
@@ -27,7 +28,7 @@
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.vip.GiveVIPApplyInfoService;
-import com.yeshi.fanli.tag.PageEntity;
+import com.yeshi.common.entity.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
@@ -54,8 +55,8 @@
* @param out
*/
@RequestMapping(value = "queryVip")
- public void queryVip(String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
- PrintWriter out) {
+ public void queryVip(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
+ PrintWriter out) {
try {
Long targetUid = null;
@@ -74,7 +75,7 @@
for (GiveVIPApplyInfo info : list) {
// 缁勭粐鐢ㄦ埛淇℃伅
- UserInfo userInfo = userInfoService.getUserById(info.getTargetUid());
+ UserInfo userInfo = userInfoService.selectByPKey(info.getTargetUid());
UserInfo simpleInfo = new UserInfo(userInfo.getId());
simpleInfo.setNickName(userInfo.getNickName());
simpleInfo.setPortrait(userInfo.getPortrait());
@@ -135,7 +136,7 @@
*/
@RequestSerializableByKey(key = "'passApplyVIP-' +#id")
@RequestMapping(value = "passVIP")
- public void passVIP(String callback, String id, PrintWriter out, HttpServletRequest request) {
+ public void passVIP(AdminAcceptData acceptData,String callback, String id, PrintWriter out, HttpServletRequest request) {
try {
/* 妫�楠屾槸鍚︾櫥闄� */
AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
@@ -165,7 +166,7 @@
*/
@RequestMapping(value = "rejectVIP")
- public void rejectVIP(String callback, String id, String reason, PrintWriter out, HttpServletRequest request) {
+ public void rejectVIP(AdminAcceptData acceptData,String callback, String id, String reason, PrintWriter out, HttpServletRequest request) {
try {
/* 妫�楠屾槸鍚︾櫥闄� */
AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
@@ -189,7 +190,7 @@
}
@RequestMapping(value = "apply")
- public void apply(String callback, Long uid, String level, String applyReason, PrintWriter out,
+ public void apply(AdminAcceptData acceptData,String callback, Long uid, String level, String applyReason, PrintWriter out,
HttpServletRequest request) {
try {
/* 妫�楠屾槸鍚︾櫥闄� */
--
Gitblit v1.8.0