回调 日期过期的BUG修改

jsjp-admin/src/test/java/com/miaxis/test/SignTest.java

@@ -0,0 +1,35 @@
+package com.miaxis.test;
+
+import com.miaxis.JsjpApplication;
+import com.miaxis.userInfo.service.IUserVipService;
+import com.miaxis.wx.dto.WxExtractBankDTO;
+import com.miaxis.wx.service.IWxExtractService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@SpringBootTest(classes = JsjpApplication.class)
+@RunWith(SpringRunner.class)
+public class SignTest {
+
+    @Autowired
+    private IUserVipService userVipService;
+
+    @Test
+    public void test2() throws Exception {
+
+        SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date  date= sf.parse("2024-01-30 13:46:13");
+
+        System.out.println(userVipService.getSignInt(932066l,date,null,null,null,1,0,0,0));
+    }
+
+
+
+
+}

jsjp-service/src/main/java/com/miaxis/order/service/impl/OrderInfoServiceImpl.java

@@ -100,16 +100,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             if (userVip != null) {
                 //修改会员信息
                 Date km1Date = userVip.getSubject1();
-                if (km1Date != null) {  //存在会员时间
-                    if (km1Date.compareTo(now) < 0) {  //会员已过期
-                        long x = now.getTime() + oneYearLong;
-                        Date km1oneYear = new Date(x);
-                        userVip.setSubject1(km1oneYear);
-                    } else {  //会员时间延长
-                        long x = km1Date.getTime() + oneYearLong;
-                        Date km1oneYear = new Date(x);
-                        userVip.setSubject1(km1oneYear);
-                    }
+                if (km1Date != null && now.compareTo(km1Date)<0) {  //存在会员时间
+                    long x = km1Date.getTime() + oneYearLong;
+                    Date km1oneYear = new Date(x);
+                    userVip.setSubject1(km1oneYear);
                     userVipService.updateById(userVip);
                     this.save(orderInfo);
                 } else {
@@ -139,16 +133,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             if (userVip != null) {
                 //修改会员信息
                 Date km1Date = userVip.getSubject1();
-                if (km1Date != null) {  //存在会员时间
-                    if (km1Date.compareTo(now) < 0) {  //会员已过期
-                        long x = now.getTime() + oneYearLong;
-                        Date km1oneYear = new Date(x);
-                        userVip.setSubject1(km1oneYear);
-                    } else {  //会员时间延长
-                        long x = km1Date.getTime() + oneYearLong;
-                        Date km1oneYear = new Date(x);
-                        userVip.setSubject1(km1oneYear);
-                    }
+                if (km1Date != null && now.compareTo(km1Date)<0) {  //存在会员时间
+                    long x = km1Date.getTime() + oneYearLong;
+                    Date km1oneYear = new Date(x);
+                    userVip.setSubject1(km1oneYear);
                     userVipService.updateById(userVip);
                     this.save(orderInfo);
                 } else {
@@ -175,16 +163,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             if (userVip != null) {
                 //修改会员信息
                 Date km2Date = userVip.getSubject2();
-                if (km2Date != null) {  //存在会员时间
-                    if (km2Date.compareTo(now) < 0) {  //会员已过期
-                        long x = now.getTime() + oneYearLong;
-                        Date km2oneYear = new Date(x);
-                        userVip.setSubject2(km2oneYear);
-                    } else {  //会员时间延长
-                        long x = km2Date.getTime() + oneYearLong;
-                        Date km2oneYear = new Date(x);
-                        userVip.setSubject2(km2oneYear);
-                    }
+                if (km2Date != null && now.compareTo(km2Date)<0) {  //存在会员时间
+                    long x = km2Date.getTime() + oneYearLong;
+                    Date km2oneYear = new Date(x);
+                    userVip.setSubject2(km2oneYear);
                     userVipService.updateById(userVip);
                     this.save(orderInfo);
                 } else {
@@ -214,16 +196,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             if (userVip != null) {
                 //修改会员信息
                 Date km2Date = userVip.getSubject2();
-                if (km2Date != null) {  //存在会员时间
-                    if (km2Date.compareTo(now) < 0) {  //会员已过期
-                        long x = now.getTime() + oneYearLong;
-                        Date km2oneYear = new Date(x);
-                        userVip.setSubject2(km2oneYear);
-                    } else {  //会员时间延长
-                        long x = km2Date.getTime() + oneYearLong;
-                        Date km2oneYear = new Date(x);
-                        userVip.setSubject2(km2oneYear);
-                    }
+                if (km2Date != null && now.compareTo(km2Date)<0) {  //存在会员时间
+                    long x = km2Date.getTime() + oneYearLong;
+                    Date km2oneYear = new Date(x);
+                    userVip.setSubject2(km2oneYear);
                     userVipService.updateById(userVip);
                     this.save(orderInfo);
                 } else {
@@ -249,16 +225,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             if (userVip != null) {
                 //修改会员信息
                 Date km3Date = userVip.getSubject3();
-                if (km3Date != null) {  //存在会员时间
-                    if (km3Date.compareTo(now) < 0) {  //会员已过期
-                        long x = now.getTime() + oneYearLong;
-                        Date km3oneYear = new Date(x);
-                        userVip.setSubject3(km3oneYear);
-                    } else {  //会员时间延长
-                        long x = km3Date.getTime() + oneYearLong;
-                        Date km3oneYear = new Date(x);
-                        userVip.setSubject3(km3oneYear);
-                    }
+                if (km3Date != null && now.compareTo(km3Date)<0) {  //存在会员时间
+                    long x = km3Date.getTime() + oneYearLong;
+                    Date km3oneYear = new Date(x);
+                    userVip.setSubject3(km3oneYear);
                     userVipService.updateById(userVip);
                     this.save(orderInfo);
                 } else {
@@ -288,16 +258,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             if (userVip != null) {
                 //修改会员信息
                 Date km3Date = userVip.getSubject3();
-                if (km3Date != null) {  //存在会员时间
-                    if (km3Date.compareTo(now) < 0) {  //会员已过期
-                        long x = now.getTime() + oneYearLong;
-                        Date km3oneYear = new Date(x);
-                        userVip.setSubject3(km3oneYear);
-                    } else {  //会员时间延长
-                        long x = km3Date.getTime() + oneYearLong;
-                        Date km3oneYear = new Date(x);
-                        userVip.setSubject3(km3oneYear);
-                    }
+                if (km3Date != null && now.compareTo(km3Date)<0) {  //存在会员时间
+                    long x = km3Date.getTime() + oneYearLong;
+                    Date km3oneYear = new Date(x);
+                    userVip.setSubject3(km3oneYear);
                     userVipService.updateById(userVip);
                     this.save(orderInfo);
                 } else {
@@ -324,16 +288,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             if (userVip != null) {
                 //修改会员信息
                 Date km4Date = userVip.getSubject4();
-                if (km4Date != null) {  //存在会员时间
-                    if (km4Date.compareTo(now) < 0) {  //会员已过期
-                        long x = now.getTime() + oneYearLong;
-                        Date km4oneYear = new Date(x);
-                        userVip.setSubject4(km4oneYear);
-                    } else {  //会员时间延长
-                        long x = km4Date.getTime() + oneYearLong;
-                        Date km4oneYear = new Date(x);
-                        userVip.setSubject4(km4oneYear);
-                    }
+                if (km4Date != null && now.compareTo(km4Date)<0) {  //存在会员时间
+                    long x = km4Date.getTime() + oneYearLong;
+                    Date km4oneYear = new Date(x);
+                    userVip.setSubject4(km4oneYear);
                     userVipService.updateById(userVip);
                     this.save(orderInfo);
                 } else {
@@ -363,16 +321,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             if (userVip != null) {
                 //修改会员信息
                 Date km4Date = userVip.getSubject4();
-                if (km4Date != null) {  //存在会员时间
-                    if (km4Date.compareTo(now) < 0) {  //会员已过期
-                        long x = now.getTime() + oneYearLong;
-                        Date km4oneYear = new Date(x);
-                        userVip.setSubject4(km4oneYear);
-                    } else {  //会员时间延长
-                        long x = km4Date.getTime() + oneYearLong;
-                        Date km4oneYear = new Date(x);
-                        userVip.setSubject4(km4oneYear);
-                    }
+                if (km4Date != null && now.compareTo(km4Date)<0) {  //存在会员时间 未过期
+                    long x = km4Date.getTime() + oneYearLong;
+                    Date km4oneYear = new Date(x);
+                    userVip.setSubject4(km4oneYear);
                     userVipService.updateById(userVip);
                     this.save(orderInfo);
                 } else {
@@ -402,7 +354,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 Date km2Date = userVip.getSubject2();
                 Date km3Date = userVip.getSubject3();
                 Date km4Date = userVip.getSubject4();
-                if (km1Date != null) { //科目一处理
+                if (km1Date != null && now.compareTo(km1Date)<0) { //科目一处理 会员还没有过期，用这个判断
                     long x = km1Date.getTime() + oneYearLong;
                     Date km1oneYear = new Date(x);
                     userVip.setSubject1(km1oneYear);
@@ -411,7 +363,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     Date km1oneYear = new Date(x);
                     userVip.setSubject1(km1oneYear);
                 }
-                if (km2Date != null) { //科目二处理
+                if (km2Date != null && now.compareTo(km2Date)<0) { //科目二处理
                     long x = km2Date.getTime() + oneYearLong;
                     Date km2oneYear = new Date(x);
                     userVip.setSubject2(km2oneYear);
@@ -420,7 +372,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     Date km2oneYear = new Date(x);
                     userVip.setSubject2(km2oneYear);
                 }
-                if (km3Date != null) { //科目三处理
+                if (km3Date != null && now.compareTo(km3Date)<0) { //科目三处理
                     long x = km3Date.getTime() + oneYearLong;
                     Date km3oneYear = new Date(x);
                     userVip.setSubject3(km3oneYear);
@@ -429,7 +381,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     Date km3oneYear = new Date(x);
                     userVip.setSubject3(km3oneYear);
                 }
-                if (km4Date != null) { //科目四处理
+                if (km4Date != null && now.compareTo(km4Date)<0) { //科目四处理
                     long x = km4Date.getTime() + oneYearLong;
                     Date km4oneYear = new Date(x);
                     userVip.setSubject4(km4oneYear);
@@ -460,7 +412,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 //修改会员信息
                 Date km1Date = userVip.getSubject1();
                 Date km4Date = userVip.getSubject4();
-                if (km1Date != null) { //科目一处理
+                if (km1Date != null && now.compareTo(km1Date)<0) { //科目一处理
                     long x = km1Date.getTime() + oneYearLong;
                     Date km1oneYear = new Date(x);
                     userVip.setSubject1(km1oneYear);
@@ -469,7 +421,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     Date km1oneYear = new Date(x);
                     userVip.setSubject1(km1oneYear);
                 }
-                if (km4Date != null) { //科目四处理
+                if (km4Date != null && now.compareTo(km4Date)<0) { //科目四处理
                     long x = km4Date.getTime() + oneYearLong;
                     Date km4oneYear = new Date(x);
                     userVip.setSubject4(km4oneYear);
@@ -502,7 +454,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 //修改会员信息
                 Date km1Date = userVip.getSubject1();
                 Date km4Date = userVip.getSubject4();
-                if (km1Date != null) { //科目一处理
+                if (km1Date != null && now.compareTo(km1Date)<0) { //科目一处理
                     long x = km1Date.getTime() + oneYearLong;
                     Date km1oneYear = new Date(x);
                     userVip.setSubject1(km1oneYear);
@@ -511,7 +463,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     Date km1oneYear = new Date(x);
                     userVip.setSubject1(km1oneYear);
                 }
-                if (km4Date != null) { //科目四处理
+                if (km4Date != null && now.compareTo(km4Date)<0) { //科目四处理
                     long x = km4Date.getTime() + oneYearLong;
                     Date km4oneYear = new Date(x);
                     userVip.setSubject4(km4oneYear);
@@ -540,7 +492,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 //修改会员信息
                 Date km2Date = userVip.getSubject2();
                 Date km3Date = userVip.getSubject3();
-                if (km2Date != null) { //科目二处理
+                if (km2Date != null && now.compareTo(km2Date)<0) { //科目二处理
                     long x = km2Date.getTime() + oneYearLong;
                     Date km2oneYear = new Date(x);
                     userVip.setSubject2(km2oneYear);
@@ -549,7 +501,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     Date km2oneYear = new Date(x);
                     userVip.setSubject2(km2oneYear);
                 }
-                if (km3Date != null) { //科目三处理
+                if (km3Date != null && now.compareTo(km3Date)<0) { //科目三处理
                     long x = km3Date.getTime() + oneYearLong;
                     Date km3oneYear = new Date(x);
                     userVip.setSubject3(km3oneYear);
@@ -582,7 +534,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 //修改会员信息
                 Date km2Date = userVip.getSubject2();
                 Date km3Date = userVip.getSubject3();
-                if (km2Date != null) { //科目二处理
+                if (km2Date != null && now.compareTo(km2Date)<0) { //科目二处理
                     long x = km2Date.getTime() + oneYearLong;
                     Date km2oneYear = new Date(x);
                     userVip.setSubject2(km2oneYear);
@@ -591,7 +543,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     Date km2oneYear = new Date(x);
                     userVip.setSubject2(km2oneYear);
                 }
-                if (km3Date != null) { //科目三处理
+                if (km3Date != null && now.compareTo(km3Date)<0) { //科目三处理
                     long x = km3Date.getTime() + oneYearLong;
                     Date km3oneYear = new Date(x);
                     userVip.setSubject3(km3oneYear);
@@ -621,7 +573,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 Date km2Date = userVip.getSubject2();
                 Date km3Date = userVip.getSubject3();
                 Date km4Date = userVip.getSubject4();
-                if (km2Date != null) { //科目二处理
+                if (km2Date != null && now.compareTo(km2Date)<0) { //科目二处理
                     long x = km2Date.getTime() + oneYearLong;
                     Date km2oneYear = new Date(x);
                     userVip.setSubject2(km2oneYear);
@@ -630,7 +582,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     Date km2oneYear = new Date(x);
                     userVip.setSubject2(km2oneYear);
                 }
-                if (km3Date != null) { //科目三处理
+                if (km3Date != null && now.compareTo(km3Date)<0) { //科目三处理
                     long x = km3Date.getTime() + oneYearLong;
                     Date km3oneYear = new Date(x);
                     userVip.setSubject3(km3oneYear);
@@ -639,7 +591,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     Date km3oneYear = new Date(x);
                     userVip.setSubject3(km3oneYear);
                 }
-                if (km4Date != null) { //科目四处理
+                if (km4Date != null && now.compareTo(km4Date)<0) { //科目四处理
                     long x = km4Date.getTime() + oneYearLong;
                     Date km4oneYear = new Date(x);
                     userVip.setSubject4(km4oneYear);
@@ -674,7 +626,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 Date km2Date = userVip.getSubject2();
                 Date km3Date = userVip.getSubject3();
                 Date km4Date = userVip.getSubject4();
-                if (km2Date != null) { //科目二处理
+                if (km2Date != null && now.compareTo(km2Date)<0) { //科目二处理
                     long x = km2Date.getTime() + oneYearLong;
                     Date km2oneYear = new Date(x);
                     userVip.setSubject2(km2oneYear);
@@ -683,7 +635,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     Date km2oneYear = new Date(x);
                     userVip.setSubject2(km2oneYear);
                 }
-                if (km3Date != null) { //科目三处理
+                if (km3Date != null && now.compareTo(km3Date)<0) { //科目三处理
                     long x = km3Date.getTime() + oneYearLong;
                     Date km3oneYear = new Date(x);
                     userVip.setSubject3(km3oneYear);
@@ -692,7 +644,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     Date km3oneYear = new Date(x);
                     userVip.setSubject3(km3oneYear);
                 }
-                if (km4Date != null) { //科目四处理
+                if (km4Date != null && now.compareTo(km4Date)<0) { //科目四处理
                     long x = km4Date.getTime() + oneYearLong;
                     Date km4oneYear = new Date(x);
                     userVip.setSubject4(km4oneYear);
@@ -722,7 +674,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 //修改会员信息
                 Date km3Date = userVip.getSubject3();
                 Date km4Date = userVip.getSubject4();
-                if (km3Date != null) { //科目三处理
+                if (km3Date != null && now.compareTo(km3Date)<0) { //科目三处理
                     long x = km3Date.getTime() + oneYearLong;
                     Date km3oneYear = new Date(x);
                     userVip.setSubject3(km3oneYear);
@@ -731,7 +683,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     Date km3oneYear = new Date(x);
                     userVip.setSubject3(km3oneYear);
                 }
-                if (km4Date != null) { //科目四处理
+                if (km4Date != null && now.compareTo(km4Date)<0) { //科目四处理
                     long x = km4Date.getTime() + oneYearLong;
                     Date km4oneYear = new Date(x);
                     userVip.setSubject4(km4oneYear);
@@ -764,7 +716,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 //修改会员信息
                 Date km3Date = userVip.getSubject3();
                 Date km4Date = userVip.getSubject4();
-                if (km3Date != null) { //科目三处理
+                if (km3Date != null && now.compareTo(km3Date)<0) { //科目三处理
                     long x = km3Date.getTime() + oneYearLong;
                     Date km3oneYear = new Date(x);
                     userVip.setSubject3(km3oneYear);
@@ -773,7 +725,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     Date km3oneYear = new Date(x);
                     userVip.setSubject3(km3oneYear);
                 }
-                if (km4Date != null) { //科目四处理
+                if (km4Date != null && now.compareTo(km4Date)<0) { //科目四处理
                     long x = km4Date.getTime() + oneYearLong;
                     Date km4oneYear = new Date(x);
                     userVip.setSubject4(km4oneYear);
@@ -804,7 +756,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 Date km2Date = userVip.getSubject2();
                 Date km3Date = userVip.getSubject3();
                 Date km4Date = userVip.getSubject4();
-                if (km1Date != null) { //科目一处理
+
+                if (km1Date != null && now.compareTo(km1Date)<0) { //科目一处理
                     long x = km1Date.getTime() + oneYearLong;
                     Date km1oneYear = new Date(x);
                     userVip.setSubject1(km1oneYear);
@@ -813,7 +766,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     Date km1oneYear = new Date(x);
                     userVip.setSubject1(km1oneYear);
                 }
-                if (km2Date != null) { //科目二处理
+                if (km2Date != null && now.compareTo(km2Date)<0) { //科目二处理
                     long x = km2Date.getTime() + oneYearLong;
                     Date km2oneYear = new Date(x);
                     userVip.setSubject2(km2oneYear);
@@ -822,7 +775,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     Date km2oneYear = new Date(x);
                     userVip.setSubject2(km2oneYear);
                 }
-                if (km3Date != null) { //科目三处理
+                if (km3Date != null && now.compareTo(km3Date)<0) { //科目三处理
                     long x = km3Date.getTime() + oneYearLong;
                     Date km3oneYear = new Date(x);
                     userVip.setSubject3(km3oneYear);
@@ -831,7 +784,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     Date km3oneYear = new Date(x);
                     userVip.setSubject3(km3oneYear);
                 }
-                if (km4Date != null) { //科目四处理
+                if (km4Date != null && now.compareTo(km4Date)<0) { //科目四处理
                     long x = km4Date.getTime() + oneYearLong;
                     Date km4oneYear = new Date(x);
                     userVip.setSubject4(km4oneYear);
@@ -868,7 +821,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 Date km2Date = userVip.getSubject2();
                 Date km3Date = userVip.getSubject3();
                 Date km4Date = userVip.getSubject4();
-                if (km1Date != null) { //科目一处理
+                if (km1Date != null && now.compareTo(km1Date)<0) { //科目一处理
                     long x = km1Date.getTime() + oneYearLong;
                     Date km1oneYear = new Date(x);
                     userVip.setSubject1(km1oneYear);
@@ -877,7 +830,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     Date km1oneYear = new Date(x);
                     userVip.setSubject1(km1oneYear);
                 }
-                if (km2Date != null) { //科目二处理
+                if (km2Date != null && now.compareTo(km2Date)<0) { //科目二处理
                     long x = km2Date.getTime() + oneYearLong;
                     Date km2oneYear = new Date(x);
                     userVip.setSubject2(km2oneYear);
@@ -886,7 +839,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     Date km2oneYear = new Date(x);
                     userVip.setSubject2(km2oneYear);
                 }
-                if (km3Date != null) { //科目三处理
+                if (km3Date != null && now.compareTo(km3Date)<0) { //科目三处理
                     long x = km3Date.getTime() + oneYearLong;
                     Date km3oneYear = new Date(x);
                     userVip.setSubject3(km3oneYear);
@@ -895,7 +848,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     Date km3oneYear = new Date(x);
                     userVip.setSubject3(km3oneYear);
                 }
-                if (km4Date != null) { //科目四处理
+                if (km4Date != null && now.compareTo(km4Date)<0) { //科目四处理
                     long x = km4Date.getTime() + oneYearLong;
                     Date km4oneYear = new Date(x);
                     userVip.setSubject4(km4oneYear);

jsjp-service/src/main/java/com/miaxis/userInfo/service/IUserVipService.java

@@ -1,5 +1,6 @@
 package com.miaxis.userInfo.service;
 
+import java.util.Date;
 import java.util.List;
 import com.miaxis.userInfo.domain.UserVip;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -23,5 +24,8 @@ public interface IUserVipService extends IService<UserVip> {
     public UserVip getUserVipByUserId(Long userId);
 
     public int removeByUserId(Long userId);
-}
 
+    String getSignInt(Long userId, Date date1, Date date2, Date date3, Date date4, Integer subject1Int, Integer subject2Int, Integer subject3Int, Integer subject4Int) throws Exception;
+
+
+}

jsjp-service/src/main/java/com/miaxis/userInfo/service/impl/UserVipServiceImpl.java

@@ -8,6 +8,12 @@ import com.miaxis.userInfo.service.IUserVipService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.security.KeyFactory;
+import java.security.PrivateKey;
+import java.security.Signature;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.util.Base64;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -21,6 +27,20 @@ public class UserVipServiceImpl extends ServiceImpl<UserVipMapper, UserVip> impl
     @Autowired
     private UserVipMapper userVipMapper;
 
+
+    private String rsaPrivateKey = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMLNHTgsyYOXDJVF8r4qCyb+8Uw4" +
+            "XKq8aThAhUIaPYIop+HJxETGbXk3e0o46i4iOX8RTv0i3jmhL6W0mSxy9ismfXPP7VtKgEt6VnMm" +
+            "ufsrQ2kcXyRsKmuwUd3rTH5gniXwLdIPF8V5ujiSq94nPHok1krDMWbss8Q7lcH2kQFHAgMBAAEC" +
+            "gYBh6Eu2TzRdMg79+7EciO8gA2Tt5SoWGipcPnl7lsqxX5O5dPpzgrPFB/CshlyVIVh6mA12Rw8g" +
+            "MfZLt7CA2asFdgGHfgCvMjsCnL2U1Nf1QFnsnGXmFXeVUvdy7XPILi75rVyOEAw+/f3KzjSA7B3w" +
+            "URE8M2QlIUcjm8LLyCVC4QJBAO+taJH7pVZGVn2upsOk14X08QU0lsQ7ufe/8VXe+IujwGMh34U6" +
+            "BHGV7grodtA7TvQ3mDggQLHB2+IxBWdDCrcCQQDQEVMI+CD7afEyN9rK/MAJwevtxNaTyEd1bhKw" +
+            "t6WKr1YbAdUz2gvnpCQjD1Gqt5yXHKu279msX9W4euXePG3xAkBUCYZn4UdIp+L9sHZSlQLoukik" +
+            "HZtbdOGw58Ez7blSJPl5CNB5wyz5sqtDcdzvCEyXvsKFs3FbonB5r9yIJ26jAkEAugGC1dXcxmWj" +
+            "dl1wf18M3qw6GkmJ+ntlRpmso8bJev3cYDB3RO99DQw0MhOT0qZqmrzK1bP+SJc0HMPhk5c6QQJA" +
+            "WRLIxmeM/P9X2mDjMrI46Wnn27QoKGgYSHdPxmLD0y7NUytf5HyCsY2vhA9FZcnikibax7SwzC/B" +
+            "D7yOXFAy/Q==";
+
     /**
      * 查询会员信息列表
      *
@@ -42,4 +62,45 @@ public class UserVipServiceImpl extends ServiceImpl<UserVipMapper, UserVip> impl
         return userVipMapper.removeByUserId(userId);
     }
 
+    @Override
+    public String getSignInt(Long userId, Date subject1, Date subject2, Date subject3, Date subject4, Integer subject1Int, Integer subject2Int, Integer subject3Int, Integer subject4Int) throws Exception {
+        String str = userId + "";
+        // System.out.println(userId);
+        if (subject1 != null) {
+            str += subject1.getTime() + "";
+        }
+        if (subject2 != null) {
+            str += subject2.getTime() + "";
+        }
+        if (subject3 != null) {
+            str += subject3.getTime() + "";
+        }
+        if (subject4 != null) {
+            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);
+        // 进行签名服务
+        Signature signature = Signature.getInstance("SHA256withRSA");
+        KeyFactory kf = KeyFactory.getInstance("RSA");
+        PrivateKey privateKey = kf.generatePrivate(new PKCS8EncodedKeySpec(Base64.getDecoder().decode(rsaPrivateKey)));
+        signature.initSign(privateKey);
+        signature.update(str.getBytes("UTF-8"));
+        byte[] signedData = signature.sign();
+
+        return Base64.getEncoder().encodeToString(signedData);
+
+    }
+
 }