下单修改驾校提成

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

@@ -875,7 +875,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
         }
         //如果是合作驾校插入消费记录表
-        savePayLog(order, userInfo,1);
+        int isShare = schPayConfigService.isSchPayConfigByJxbh(userInfo.getSchool());
+        if (isShare == 1) {
+            savePayLog(order, userInfo,1);
+        }
     }
 
 
@@ -900,16 +903,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 {
@@ -936,16 +933,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 {
@@ -971,16 +962,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 {
@@ -1007,16 +992,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 {
@@ -1046,7 +1025,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);
@@ -1055,7 +1034,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);
@@ -1064,7 +1043,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);
@@ -1073,7 +1052,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     Date km3oneYear = new Date(x);
                     userVip.setSubject3(km3oneYear);
                 }
-                if (km4Date != null) { //科目四处理
+                if (km4Date != null && now.compareTo(km3Date)<0) { //科目四处理
                     long x = km4Date.getTime() + oneYearLong;
                     Date km4oneYear = new Date(x);
                     userVip.setSubject4(km4oneYear);
@@ -1104,7 +1083,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);
@@ -1113,7 +1092,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);
@@ -1142,7 +1121,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);
@@ -1151,7 +1130,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);
@@ -1181,7 +1160,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);
@@ -1190,7 +1169,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);
@@ -1199,7 +1178,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);
@@ -1229,7 +1208,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);
@@ -1238,7 +1217,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);
@@ -1269,7 +1248,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);
@@ -1278,7 +1257,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);
@@ -1287,7 +1266,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);
@@ -1296,7 +1275,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);