添加获取会员 0-1接口

jsjp-admin/src/main/java/com/miaxis/app/controller/userInfo/UserVipController.java

@@ -95,62 +95,57 @@ public class UserVipController extends BaseController {
             @PathVariable("userId") Long userId
     ) throws Exception {
         UserVip userVip = userVipService.getUserVipByUserId(userId);
-        UserVipVO vo = new UserVipVO();
-        UserVipTFVO vo2 = new UserVipTFVO();
-        vo2.setId(vo.getId());
-        vo2.setUserId(vo.getUserId());
-        vo2.setUserName(vo.getUserName());
-
+        UserVipTFVO vo = new UserVipTFVO();
         if (userVip != null) {
             BeanUtils.copyProperties(userVip, vo);
             Date now = new Date();
             //科一
             if(vo.getSubject1()!=null){
                 if(now.compareTo(vo.getSubject1())>0) {  //如果过期
-                    vo2.setSubject1Int(0);
+                    vo.setSubject1Int(0);
                 } else {
-                    vo2.setSubject1Int(1);
+                    vo.setSubject1Int(1);
                 }
             } else {
-                vo2.setSubject1Int(0);
+                vo.setSubject1Int(0);
             }
             //科二
             if(vo.getSubject2()!=null){
                 if(now.compareTo(vo.getSubject2())>0) {  //如果过期
-                    vo2.setSubject2Int(0);
+                    vo.setSubject2Int(0);
                 } else {
-                    vo2.setSubject2Int(1);
+                    vo.setSubject2Int(1);
                 }
             } else {
-                vo2.setSubject2Int(0);
+                vo.setSubject2Int(0);
             }
             //科三
             if(vo.getSubject3()!=null){
                 if(now.compareTo(vo.getSubject3())>0) {  //如果过期
-                    vo2.setSubject3Int(0);
+                    vo.setSubject3Int(0);
                 } else {
-                    vo2.setSubject3Int(1);
+                    vo.setSubject3Int(1);
                 }
             } else {
-                vo2.setSubject3Int(0);
+                vo.setSubject3Int(0);
             }
             //科四
             if(vo.getSubject4()!=null){
                 if(now.compareTo(vo.getSubject4())>0) {  //如果过期
-                    vo2.setSubject4Int(0);
+                    vo.setSubject4Int(0);
                 } else {
-                    vo2.setSubject4Int(1);
+                    vo.setSubject4Int(1);
                 }
             } else {
-                vo2.setSubject4Int(0);
+                vo.setSubject4Int(0);
             }
 
-            String sign = getSignInt(vo2.getUserId(),vo2.getSubject1(), vo2.getSubject2(), vo2.getSubject3(),vo2.getSubject4(),
-                    vo2.getSubject1Int(),vo2.getSubject2Int(),vo2.getSubject3Int(),vo2.getSubject3Int(),vo2.getSubject4Int());
-            vo2.setSign(sign);
-            return Response.success(vo2);
+            String sign = getSignInt(vo.getUserId(),vo.getSubject1(), vo.getSubject2(), vo.getSubject3(),vo.getSubject4(),
+                    vo.getSubject1Int(),vo.getSubject2Int(),vo.getSubject3Int(),vo.getSubject3Int(),vo.getSubject4Int());
+            vo.setSign(sign);
+            return Response.success(vo);
         } else {
-            return Response.success(vo2);
+            return Response.success(vo);
         }
     }