添加获取会员 0-1接口

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

@@ -107,45 +107,46 @@ public class UserVipController extends BaseController {
             //科一
             if(vo.getSubject1()!=null){
                 if(now.compareTo(vo.getSubject1())>0) {  //如果过期
-                    vo2.setSubject1(0);
+                    vo2.setSubject1Int(0);
                 } else {
-                    vo2.setSubject1(1);
+                    vo2.setSubject1Int(1);
                 }
             } else {
-                vo2.setSubject1(0);
+                vo2.setSubject1Int(0);
             }
             //科二
             if(vo.getSubject2()!=null){
                 if(now.compareTo(vo.getSubject2())>0) {  //如果过期
-                    vo2.setSubject2(0);
+                    vo2.setSubject2Int(0);
                 } else {
-                    vo2.setSubject2(1);
+                    vo2.setSubject2Int(1);
                 }
             } else {
-                vo2.setSubject2(0);
+                vo2.setSubject2Int(0);
             }
             //科三
             if(vo.getSubject3()!=null){
                 if(now.compareTo(vo.getSubject3())>0) {  //如果过期
-                    vo2.setSubject3(0);
+                    vo2.setSubject3Int(0);
                 } else {
-                    vo2.setSubject3(1);
+                    vo2.setSubject3Int(1);
                 }
             } else {
-                vo2.setSubject3(0);
+                vo2.setSubject3Int(0);
             }
             //科四
             if(vo.getSubject4()!=null){
                 if(now.compareTo(vo.getSubject4())>0) {  //如果过期
-                    vo2.setSubject4(0);
+                    vo2.setSubject4Int(0);
                 } else {
-                    vo2.setSubject4(1);
+                    vo2.setSubject4Int(1);
                 }
             } else {
-                vo2.setSubject4(0);
+                vo2.setSubject4Int(0);
             }
 
-            String sign = getSign(vo.getUserId(),vo2.getSubject1(), vo2.getSubject2(), vo2.getSubject3(),vo2.getSubject4());
+            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);
         } else {
@@ -199,21 +200,32 @@ public class UserVipController extends BaseController {
 
     }
 
-    private String getSign(Long userId, Integer subject1, Integer subject2, Integer subject3, Integer subject4) throws Exception {
+    private String getSignInt(Long userId, Date subject1, Date subject2, Date subject3, Date subject4, Integer subject1Int, Integer subject2Int, Integer subject3Int, Integer anInt, Integer subject4Int) throws Exception {
         String str = userId + "";
         // System.out.println(userId);
-
         if (subject1 != null) {
-            str += subject1 + "";
+            str += subject1.getTime() + "";
         }
         if (subject2 != null) {
-            str += subject2 + "";
+            str += subject2.getTime() + "";
         }
         if (subject3 != null) {
-            str += subject3 + "";
+            str += subject3.getTime() + "";
         }
         if (subject4 != null) {
-            str += subject4 + "";
+            str += subject4.getTime() + "";
+        }
+        if (subject1Int != null) {
+            str += subject1Int + "";
+        }
+        if (subject2Int != null) {
+            str += subject2Int + "";
+        }
+        if (subject3Int != null) {
+            str += subject3Int + "";
+        }
+        if (subject4Int != null) {
+            str += subject4Int + "";
         }
         System.out.println("str：" + str);
         // 进行签名服务

jsjp-service/src/main/java/com/miaxis/userInfo/vo/UserVipTFVO.java

@@ -33,19 +33,37 @@ public class UserVipTFVO implements Serializable {
 
     @ApiModelProperty(value = "科目2  到期时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Integer subject1;
+    private Integer subject1Int;
 
     @ApiModelProperty(value = "科目2  到期时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Integer subject2;
+    private Integer subject2Int;
 
     @ApiModelProperty(value = "科目2  到期时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Integer subject3;
+    private Integer subject3Int;
 
     @ApiModelProperty(value = "科目3  到期时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Integer subject4;
+    private Integer subject4Int;
+
+
+    @ApiModelProperty(value = "科目2  到期时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date subject1;
+
+    @ApiModelProperty(value = "科目2  到期时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date subject2;
+
+    @ApiModelProperty(value = "科目2  到期时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date subject3;
+
+    @ApiModelProperty(value = "科目3  到期时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date subject4;
+
 
     @ApiModelProperty(value = "签名")
     private String sign;