考场退款接口修改

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

@@ -1391,412 +1391,423 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
      * @param order
      */
     public void refundOrder(WxJsOrder order) {
-        long oneYearLong = 1000 * 60 * 60 * 24 * 365l;
-        Date now = new Date();
-
-        GzptUserInfo userInfo = userInfoService.getInfoById(order.getUserId());
-        if(userInfo==null){
-            GzptUserInfoDel userInfoDel = userInfoDelService.getInfoDelById(order.getUserId());
-            BeanUtils.copyProperties(userInfoDel,userInfo);
-        }
 
-        int isActiva = schActivationService.isSchActivation(order.getUserId());
-        if ("理论实操计时".equals(order.getGoodsName())) {
-            //删除激活
-            if(isActiva==1) {
-                schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
-            }
-        } else if ("科一专项VIP(含计时)".equals(order.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km1Date = userVip.getSubject1();
-                if (km1Date != null) {  //存在会员时间
-                    long x = km1Date.getTime() - oneYearLong;
-                    Date km1oneYear = new Date(x);
-                    userVip.setSubject1(km1oneYear);
-                    userVipService.updateById(userVip);
-                }
-            }
-            //删除激活
-            if(isActiva==1) {
-                schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
-            }
-        } else if ("科一专项VIP".equals(order.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km1Date = userVip.getSubject1();
-                if (km1Date != null) {  //存在会员时间
-                    long x = km1Date.getTime() - oneYearLong;
-                    Date km1oneYear = new Date(x);
-                    userVip.setSubject1(km1oneYear);
-                    userVipService.updateById(userVip);
-                }
-            }
-        } else if ("科二专项VIP(含计时)".equals(order.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km2Date = userVip.getSubject2();
-                if (km2Date != null) {  //存在会员时间
-                    long x = km2Date.getTime() - oneYearLong;
-                    Date km2oneYear = new Date(x);
-                    userVip.setSubject2(km2oneYear);
-                    userVipService.updateById(userVip);
-                }
-            }
-            //删除激活
-            if(isActiva==1) {
-                schActivationService.upDelSchActivationByUserId(userInfo.getOutId(),1);
-            }
-        } else if ("科二专项VIP".equals(order.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km2Date = userVip.getSubject2();
-                if (km2Date != null) {  //存在会员时间
-                    long x = km2Date.getTime() - oneYearLong;
-                    Date km2oneYear = new Date(x);
-                    userVip.setSubject2(km2oneYear);
-                    userVipService.updateById(userVip);
-                }
-            }
-        } else if ("科三专项VIP(含计时)".equals(order.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km3Date = userVip.getSubject3();
-                if (km3Date != null) {  //存在会员时间
-                    long x = km3Date.getTime() - oneYearLong;
-                    Date km3oneYear = new Date(x);
-                    userVip.setSubject3(km3oneYear);
-                    userVipService.updateById(userVip);
-                }
-            }
-            //删除激活
-            if(isActiva==1) {
-                schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
-            }
-        } else if ("科三专项VIP".equals(order.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km3Date = userVip.getSubject3();
-                if (km3Date != null) {  //存在会员时间
-                    long x = km3Date.getTime() - oneYearLong;
-                    Date km3oneYear = new Date(x);
-                    userVip.setSubject3(km3oneYear);
-                    userVipService.updateById(userVip);
-                }
-            }
-        } else if ("科四专项VIP(含计时)".equals(order.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km4Date = userVip.getSubject4();
-                if (km4Date != null) {  //存在会员时间
-                    long x = km4Date.getTime() - oneYearLong;
-                    Date km4oneYear = new Date(x);
-                    userVip.setSubject4(km4oneYear);
-                    userVipService.updateById(userVip);
-                }
-            }
-            //删除激活
-            if(isActiva==1) {
-                schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
-            }
-        } else if ("科四专项VIP".equals(order.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km4Date = userVip.getSubject4();
-                if (km4Date != null) {  //存在会员时间
-                    long x = km4Date.getTime() - oneYearLong;
-                    Date km4oneYear = new Date(x);
-                    userVip.setSubject4(km4oneYear);
-                    userVipService.updateById(userVip);
-                }
-            }
-        } else if ("科目一二三四所有付费权益".equals(order.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km1Date = userVip.getSubject1();
-                if (km1Date != null) {  //存在会员时间
-                    long x = km1Date.getTime() - oneYearLong;
-                    Date km1oneYear = new Date(x);
-                    userVip.setSubject1(km1oneYear);
-                }
-                Date km2Date = userVip.getSubject2();
-                if (km2Date != null) {  //存在会员时间
-                    long x = km2Date.getTime() - oneYearLong;
-                    Date km2oneYear = new Date(x);
-                    userVip.setSubject2(km2oneYear);
-                }
-                Date km3Date = userVip.getSubject3();
-                if (km3Date != null) {  //存在会员时间
-                    long x = km3Date.getTime() - oneYearLong;
-                    Date km3oneYear = new Date(x);
-                    userVip.setSubject3(km3oneYear);
+        switch (order.getGoodsType()) {
+            case 1:
+                long oneYearLong = 1000 * 60 * 60 * 24 * 365l;
+                GzptUserInfo userInfo = userInfoService.getInfoById(order.getUserId());
+                if(userInfo==null){
+                    GzptUserInfoDel userInfoDel = userInfoDelService.getInfoDelById(order.getUserId());
+                    BeanUtils.copyProperties(userInfoDel,userInfo);
                 }
 
-                Date km4Date = userVip.getSubject4();
-                if (km4Date != null) {  //存在会员时间
-                    long x = km4Date.getTime() - oneYearLong;
-                    Date km4oneYear = new Date(x);
-                    userVip.setSubject4(km4oneYear);
-                }
-                userVipService.updateById(userVip);
-            }
-        } else if ("科一+科四VIP(含计时)".equals(order.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km1Date = userVip.getSubject1();
-                if (km1Date != null) {  //存在会员时间
-                    long x = km1Date.getTime() - oneYearLong;
-                    Date km1oneYear = new Date(x);
-                    userVip.setSubject1(km1oneYear);
-                }
-                Date km4Date = userVip.getSubject4();
-                if (km4Date != null) {  //存在会员时间
-                    long x = km4Date.getTime() - oneYearLong;
-                    Date km4oneYear = new Date(x);
-                    userVip.setSubject4(km4oneYear);
-                }
-                userVipService.updateById(userVip);
-            }
-            //删除激活
-            if(isActiva==1) {
-                schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
-            }
-        } else if ("科一+科四VIP".equals(order.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km1Date = userVip.getSubject1();
-                if (km1Date != null) {  //存在会员时间
-                    long x = km1Date.getTime() - oneYearLong;
-                    Date km1oneYear = new Date(x);
-                    userVip.setSubject1(km1oneYear);
-                }
-                Date km4Date = userVip.getSubject4();
-                if (km4Date != null) {  //存在会员时间
-                    long x = km4Date.getTime() - oneYearLong;
-                    Date km4oneYear = new Date(x);
-                    userVip.setSubject4(km4oneYear);
-                }
-                userVipService.updateById(userVip);
-            }
-        } else if ("科二+科三VIP(含计时)".equals(order.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km2Date = userVip.getSubject2();
-                if (km2Date != null) {  //存在会员时间
-                    long x = km2Date.getTime() - oneYearLong;
-                    Date km2oneYear = new Date(x);
-                    userVip.setSubject2(km2oneYear);
-                }
-                Date km3Date = userVip.getSubject3();
-                if (km3Date != null) {  //存在会员时间
-                    long x = km3Date.getTime() - oneYearLong;
-                    Date km3oneYear = new Date(x);
-                    userVip.setSubject3(km3oneYear);
-                }
-                userVipService.updateById(userVip);
-            }
-            //删除激活
-            if(isActiva==1) {
-                schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
-            }
-        } else if ("科二+科三VIP".equals(order.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km2Date = userVip.getSubject2();
-                if (km2Date != null) {  //存在会员时间
-                    long x = km2Date.getTime() - oneYearLong;
-                    Date km2oneYear = new Date(x);
-                    userVip.setSubject2(km2oneYear);
-                }
-                Date km3Date = userVip.getSubject3();
-                if (km3Date != null) {  //存在会员时间
-                    long x = km3Date.getTime() - oneYearLong;
-                    Date km3oneYear = new Date(x);
-                    userVip.setSubject3(km3oneYear);
-                }
-                userVipService.updateById(userVip);
-            }
-        } else if ("科二+科三+科四(含计时)".equals(order.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km2Date = userVip.getSubject2();
-                if (km2Date != null) {  //存在会员时间
-                    long x = km2Date.getTime() - oneYearLong;
-                    Date km2oneYear = new Date(x);
-                    userVip.setSubject2(km2oneYear);
-                }
-                Date km3Date = userVip.getSubject3();
-                if (km3Date != null) {  //存在会员时间
-                    long x = km3Date.getTime() - oneYearLong;
-                    Date km3oneYear = new Date(x);
-                    userVip.setSubject3(km3oneYear);
-                }
-                Date km4Date = userVip.getSubject4();
-                if (km4Date != null) {  //存在会员时间
-                    long x = km4Date.getTime() - oneYearLong;
-                    Date km4oneYear = new Date(x);
-                    userVip.setSubject4(km4oneYear);
-                }
-                userVipService.updateById(userVip);
-            }
-            //删除激活
-            if(isActiva==1) {
-                schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
-            }
-        } else if ("科二+科三+科四".equals(order.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km2Date = userVip.getSubject2();
-                if (km2Date != null) {  //存在会员时间
-                    long x = km2Date.getTime() - oneYearLong;
-                    Date km2oneYear = new Date(x);
-                    userVip.setSubject2(km2oneYear);
-                }
-                Date km3Date = userVip.getSubject3();
-                if (km3Date != null) {  //存在会员时间
-                    long x = km3Date.getTime() - oneYearLong;
-                    Date km3oneYear = new Date(x);
-                    userVip.setSubject3(km3oneYear);
-                }
-                Date km4Date = userVip.getSubject4();
-                if (km4Date != null) {  //存在会员时间
-                    long x = km4Date.getTime() - oneYearLong;
-                    Date km4oneYear = new Date(x);
-                    userVip.setSubject4(km4oneYear);
-                }
-                userVipService.updateById(userVip);
-            }
-        } else if ("科三+科四VIP(含计时)".equals(order.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km3Date = userVip.getSubject3();
-                if (km3Date != null) {  //存在会员时间
-                    long x = km3Date.getTime() - oneYearLong;
-                    Date km3oneYear = new Date(x);
-                    userVip.setSubject3(km3oneYear);
-                }
-                Date km4Date = userVip.getSubject4();
-                if (km4Date != null) {  //存在会员时间
-                    long x = km4Date.getTime() - oneYearLong;
-                    Date km4oneYear = new Date(x);
-                    userVip.setSubject4(km4oneYear);
-                }
-                userVipService.updateById(userVip);
-            }
-            //删除激活
-            if(isActiva==1) {
-                schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
-            }
-        } else if ("科三+科四VIP".equals(order.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km3Date = userVip.getSubject3();
-                if (km3Date != null) {  //存在会员时间
-                    long x = km3Date.getTime() - oneYearLong;
-                    Date km3oneYear = new Date(x);
-                    userVip.setSubject3(km3oneYear);
-                }
-                Date km4Date = userVip.getSubject4();
-                if (km4Date != null) {  //存在会员时间
-                    long x = km4Date.getTime() - oneYearLong;
-                    Date km4oneYear = new Date(x);
-                    userVip.setSubject4(km4oneYear);
-                }
-                userVipService.updateById(userVip);
-            }
-        } else if ("全科目超级VIP(含计时)".equals(order.getGoodsName())){
-            UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km1Date = userVip.getSubject1();
-                if (km1Date != null) {  //存在会员时间
-                    long x = km1Date.getTime() - oneYearLong;
-                    Date km1oneYear = new Date(x);
-                    userVip.setSubject1(km1oneYear);
-                }
-                Date km2Date = userVip.getSubject2();
-                if (km2Date != null) {  //存在会员时间
-                    long x = km2Date.getTime() - oneYearLong;
-                    Date km2oneYear = new Date(x);
-                    userVip.setSubject2(km2oneYear);
-                }
-                Date km3Date = userVip.getSubject3();
-                if (km3Date != null) {  //存在会员时间
-                    long x = km3Date.getTime() - oneYearLong;
-                    Date km3oneYear = new Date(x);
-                    userVip.setSubject3(km3oneYear);
-                }
+                int isActiva = schActivationService.isSchActivation(order.getUserId());
+                if ("理论实操计时".equals(order.getGoodsName())) {
+                    //删除激活
+                    if(isActiva==1) {
+                        schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
+                    }
+                } else if ("科一专项VIP(含计时)".equals(order.getGoodsName())) {
+                    UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
+                    if (userVip != null) {
+                        //修改会员信息
+                        Date km1Date = userVip.getSubject1();
+                        if (km1Date != null) {  //存在会员时间
+                            long x = km1Date.getTime() - oneYearLong;
+                            Date km1oneYear = new Date(x);
+                            userVip.setSubject1(km1oneYear);
+                            userVipService.updateById(userVip);
+                        }
+                    }
+                    //删除激活
+                    if(isActiva==1) {
+                        schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
+                    }
+                } else if ("科一专项VIP".equals(order.getGoodsName())) {
+                    UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
+                    if (userVip != null) {
+                        //修改会员信息
+                        Date km1Date = userVip.getSubject1();
+                        if (km1Date != null) {  //存在会员时间
+                            long x = km1Date.getTime() - oneYearLong;
+                            Date km1oneYear = new Date(x);
+                            userVip.setSubject1(km1oneYear);
+                            userVipService.updateById(userVip);
+                        }
+                    }
+                } else if ("科二专项VIP(含计时)".equals(order.getGoodsName())) {
+                    UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
+                    if (userVip != null) {
+                        //修改会员信息
+                        Date km2Date = userVip.getSubject2();
+                        if (km2Date != null) {  //存在会员时间
+                            long x = km2Date.getTime() - oneYearLong;
+                            Date km2oneYear = new Date(x);
+                            userVip.setSubject2(km2oneYear);
+                            userVipService.updateById(userVip);
+                        }
+                    }
+                    //删除激活
+                    if(isActiva==1) {
+                        schActivationService.upDelSchActivationByUserId(userInfo.getOutId(),1);
+                    }
+                } else if ("科二专项VIP".equals(order.getGoodsName())) {
+                    UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
+                    if (userVip != null) {
+                        //修改会员信息
+                        Date km2Date = userVip.getSubject2();
+                        if (km2Date != null) {  //存在会员时间
+                            long x = km2Date.getTime() - oneYearLong;
+                            Date km2oneYear = new Date(x);
+                            userVip.setSubject2(km2oneYear);
+                            userVipService.updateById(userVip);
+                        }
+                    }
+                } else if ("科三专项VIP(含计时)".equals(order.getGoodsName())) {
+                    UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
+                    if (userVip != null) {
+                        //修改会员信息
+                        Date km3Date = userVip.getSubject3();
+                        if (km3Date != null) {  //存在会员时间
+                            long x = km3Date.getTime() - oneYearLong;
+                            Date km3oneYear = new Date(x);
+                            userVip.setSubject3(km3oneYear);
+                            userVipService.updateById(userVip);
+                        }
+                    }
+                    //删除激活
+                    if(isActiva==1) {
+                        schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
+                    }
+                } else if ("科三专项VIP".equals(order.getGoodsName())) {
+                    UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
+                    if (userVip != null) {
+                        //修改会员信息
+                        Date km3Date = userVip.getSubject3();
+                        if (km3Date != null) {  //存在会员时间
+                            long x = km3Date.getTime() - oneYearLong;
+                            Date km3oneYear = new Date(x);
+                            userVip.setSubject3(km3oneYear);
+                            userVipService.updateById(userVip);
+                        }
+                    }
+                } else if ("科四专项VIP(含计时)".equals(order.getGoodsName())) {
+                    UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
+                    if (userVip != null) {
+                        //修改会员信息
+                        Date km4Date = userVip.getSubject4();
+                        if (km4Date != null) {  //存在会员时间
+                            long x = km4Date.getTime() - oneYearLong;
+                            Date km4oneYear = new Date(x);
+                            userVip.setSubject4(km4oneYear);
+                            userVipService.updateById(userVip);
+                        }
+                    }
+                    //删除激活
+                    if(isActiva==1) {
+                        schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
+                    }
+                } else if ("科四专项VIP".equals(order.getGoodsName())) {
+                    UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
+                    if (userVip != null) {
+                        //修改会员信息
+                        Date km4Date = userVip.getSubject4();
+                        if (km4Date != null) {  //存在会员时间
+                            long x = km4Date.getTime() - oneYearLong;
+                            Date km4oneYear = new Date(x);
+                            userVip.setSubject4(km4oneYear);
+                            userVipService.updateById(userVip);
+                        }
+                    }
+                } else if ("科目一二三四所有付费权益".equals(order.getGoodsName())) {
+                    UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
+                    if (userVip != null) {
+                        //修改会员信息
+                        Date km1Date = userVip.getSubject1();
+                        if (km1Date != null) {  //存在会员时间
+                            long x = km1Date.getTime() - oneYearLong;
+                            Date km1oneYear = new Date(x);
+                            userVip.setSubject1(km1oneYear);
+                        }
+                        Date km2Date = userVip.getSubject2();
+                        if (km2Date != null) {  //存在会员时间
+                            long x = km2Date.getTime() - oneYearLong;
+                            Date km2oneYear = new Date(x);
+                            userVip.setSubject2(km2oneYear);
+                        }
+                        Date km3Date = userVip.getSubject3();
+                        if (km3Date != null) {  //存在会员时间
+                            long x = km3Date.getTime() - oneYearLong;
+                            Date km3oneYear = new Date(x);
+                            userVip.setSubject3(km3oneYear);
+                        }
 
-                Date km4Date = userVip.getSubject4();
-                if (km4Date != null) {  //存在会员时间
-                    long x = km4Date.getTime() - oneYearLong;
-                    Date km4oneYear = new Date(x);
-                    userVip.setSubject4(km4oneYear);
-                }
-                userVipService.updateById(userVip);
-            }
-            //删除激活
-            if(isActiva==1) {
-                schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
-            }
-        } else if ("全科目超级VIP".equals(order.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km1Date = userVip.getSubject1();
-                if (km1Date != null) {  //存在会员时间
-                    long x = km1Date.getTime() - oneYearLong;
-                    Date km1oneYear = new Date(x);
-                    userVip.setSubject1(km1oneYear);
-                }
-                Date km2Date = userVip.getSubject2();
-                if (km2Date != null) {  //存在会员时间
-                    long x = km2Date.getTime() - oneYearLong;
-                    Date km2oneYear = new Date(x);
-                    userVip.setSubject2(km2oneYear);
-                }
-                Date km3Date = userVip.getSubject3();
-                if (km3Date != null) {  //存在会员时间
-                    long x = km3Date.getTime() - oneYearLong;
-                    Date km3oneYear = new Date(x);
-                    userVip.setSubject3(km3oneYear);
-                }
+                        Date km4Date = userVip.getSubject4();
+                        if (km4Date != null) {  //存在会员时间
+                            long x = km4Date.getTime() - oneYearLong;
+                            Date km4oneYear = new Date(x);
+                            userVip.setSubject4(km4oneYear);
+                        }
+                        userVipService.updateById(userVip);
+                    }
+                } else if ("科一+科四VIP(含计时)".equals(order.getGoodsName())) {
+                    UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
+                    if (userVip != null) {
+                        //修改会员信息
+                        Date km1Date = userVip.getSubject1();
+                        if (km1Date != null) {  //存在会员时间
+                            long x = km1Date.getTime() - oneYearLong;
+                            Date km1oneYear = new Date(x);
+                            userVip.setSubject1(km1oneYear);
+                        }
+                        Date km4Date = userVip.getSubject4();
+                        if (km4Date != null) {  //存在会员时间
+                            long x = km4Date.getTime() - oneYearLong;
+                            Date km4oneYear = new Date(x);
+                            userVip.setSubject4(km4oneYear);
+                        }
+                        userVipService.updateById(userVip);
+                    }
+                    //删除激活
+                    if(isActiva==1) {
+                        schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
+                    }
+                } else if ("科一+科四VIP".equals(order.getGoodsName())) {
+                    UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
+                    if (userVip != null) {
+                        //修改会员信息
+                        Date km1Date = userVip.getSubject1();
+                        if (km1Date != null) {  //存在会员时间
+                            long x = km1Date.getTime() - oneYearLong;
+                            Date km1oneYear = new Date(x);
+                            userVip.setSubject1(km1oneYear);
+                        }
+                        Date km4Date = userVip.getSubject4();
+                        if (km4Date != null) {  //存在会员时间
+                            long x = km4Date.getTime() - oneYearLong;
+                            Date km4oneYear = new Date(x);
+                            userVip.setSubject4(km4oneYear);
+                        }
+                        userVipService.updateById(userVip);
+                    }
+                } else if ("科二+科三VIP(含计时)".equals(order.getGoodsName())) {
+                    UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
+                    if (userVip != null) {
+                        //修改会员信息
+                        Date km2Date = userVip.getSubject2();
+                        if (km2Date != null) {  //存在会员时间
+                            long x = km2Date.getTime() - oneYearLong;
+                            Date km2oneYear = new Date(x);
+                            userVip.setSubject2(km2oneYear);
+                        }
+                        Date km3Date = userVip.getSubject3();
+                        if (km3Date != null) {  //存在会员时间
+                            long x = km3Date.getTime() - oneYearLong;
+                            Date km3oneYear = new Date(x);
+                            userVip.setSubject3(km3oneYear);
+                        }
+                        userVipService.updateById(userVip);
+                    }
+                    //删除激活
+                    if(isActiva==1) {
+                        schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
+                    }
+                } else if ("科二+科三VIP".equals(order.getGoodsName())) {
+                    UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
+                    if (userVip != null) {
+                        //修改会员信息
+                        Date km2Date = userVip.getSubject2();
+                        if (km2Date != null) {  //存在会员时间
+                            long x = km2Date.getTime() - oneYearLong;
+                            Date km2oneYear = new Date(x);
+                            userVip.setSubject2(km2oneYear);
+                        }
+                        Date km3Date = userVip.getSubject3();
+                        if (km3Date != null) {  //存在会员时间
+                            long x = km3Date.getTime() - oneYearLong;
+                            Date km3oneYear = new Date(x);
+                            userVip.setSubject3(km3oneYear);
+                        }
+                        userVipService.updateById(userVip);
+                    }
+                } else if ("科二+科三+科四(含计时)".equals(order.getGoodsName())) {
+                    UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
+                    if (userVip != null) {
+                        //修改会员信息
+                        Date km2Date = userVip.getSubject2();
+                        if (km2Date != null) {  //存在会员时间
+                            long x = km2Date.getTime() - oneYearLong;
+                            Date km2oneYear = new Date(x);
+                            userVip.setSubject2(km2oneYear);
+                        }
+                        Date km3Date = userVip.getSubject3();
+                        if (km3Date != null) {  //存在会员时间
+                            long x = km3Date.getTime() - oneYearLong;
+                            Date km3oneYear = new Date(x);
+                            userVip.setSubject3(km3oneYear);
+                        }
+                        Date km4Date = userVip.getSubject4();
+                        if (km4Date != null) {  //存在会员时间
+                            long x = km4Date.getTime() - oneYearLong;
+                            Date km4oneYear = new Date(x);
+                            userVip.setSubject4(km4oneYear);
+                        }
+                        userVipService.updateById(userVip);
+                    }
+                    //删除激活
+                    if(isActiva==1) {
+                        schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
+                    }
+                } else if ("科二+科三+科四".equals(order.getGoodsName())) {
+                    UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
+                    if (userVip != null) {
+                        //修改会员信息
+                        Date km2Date = userVip.getSubject2();
+                        if (km2Date != null) {  //存在会员时间
+                            long x = km2Date.getTime() - oneYearLong;
+                            Date km2oneYear = new Date(x);
+                            userVip.setSubject2(km2oneYear);
+                        }
+                        Date km3Date = userVip.getSubject3();
+                        if (km3Date != null) {  //存在会员时间
+                            long x = km3Date.getTime() - oneYearLong;
+                            Date km3oneYear = new Date(x);
+                            userVip.setSubject3(km3oneYear);
+                        }
+                        Date km4Date = userVip.getSubject4();
+                        if (km4Date != null) {  //存在会员时间
+                            long x = km4Date.getTime() - oneYearLong;
+                            Date km4oneYear = new Date(x);
+                            userVip.setSubject4(km4oneYear);
+                        }
+                        userVipService.updateById(userVip);
+                    }
+                } else if ("科三+科四VIP(含计时)".equals(order.getGoodsName())) {
+                    UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
+                    if (userVip != null) {
+                        //修改会员信息
+                        Date km3Date = userVip.getSubject3();
+                        if (km3Date != null) {  //存在会员时间
+                            long x = km3Date.getTime() - oneYearLong;
+                            Date km3oneYear = new Date(x);
+                            userVip.setSubject3(km3oneYear);
+                        }
+                        Date km4Date = userVip.getSubject4();
+                        if (km4Date != null) {  //存在会员时间
+                            long x = km4Date.getTime() - oneYearLong;
+                            Date km4oneYear = new Date(x);
+                            userVip.setSubject4(km4oneYear);
+                        }
+                        userVipService.updateById(userVip);
+                    }
+                    //删除激活
+                    if(isActiva==1) {
+                        schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
+                    }
+                } else if ("科三+科四VIP".equals(order.getGoodsName())) {
+                    UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
+                    if (userVip != null) {
+                        //修改会员信息
+                        Date km3Date = userVip.getSubject3();
+                        if (km3Date != null) {  //存在会员时间
+                            long x = km3Date.getTime() - oneYearLong;
+                            Date km3oneYear = new Date(x);
+                            userVip.setSubject3(km3oneYear);
+                        }
+                        Date km4Date = userVip.getSubject4();
+                        if (km4Date != null) {  //存在会员时间
+                            long x = km4Date.getTime() - oneYearLong;
+                            Date km4oneYear = new Date(x);
+                            userVip.setSubject4(km4oneYear);
+                        }
+                        userVipService.updateById(userVip);
+                    }
+                } else if ("全科目超级VIP(含计时)".equals(order.getGoodsName())){
+                    UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
+                    if (userVip != null) {
+                        //修改会员信息
+                        Date km1Date = userVip.getSubject1();
+                        if (km1Date != null) {  //存在会员时间
+                            long x = km1Date.getTime() - oneYearLong;
+                            Date km1oneYear = new Date(x);
+                            userVip.setSubject1(km1oneYear);
+                        }
+                        Date km2Date = userVip.getSubject2();
+                        if (km2Date != null) {  //存在会员时间
+                            long x = km2Date.getTime() - oneYearLong;
+                            Date km2oneYear = new Date(x);
+                            userVip.setSubject2(km2oneYear);
+                        }
+                        Date km3Date = userVip.getSubject3();
+                        if (km3Date != null) {  //存在会员时间
+                            long x = km3Date.getTime() - oneYearLong;
+                            Date km3oneYear = new Date(x);
+                            userVip.setSubject3(km3oneYear);
+                        }
+
+                        Date km4Date = userVip.getSubject4();
+                        if (km4Date != null) {  //存在会员时间
+                            long x = km4Date.getTime() - oneYearLong;
+                            Date km4oneYear = new Date(x);
+                            userVip.setSubject4(km4oneYear);
+                        }
+                        userVipService.updateById(userVip);
+                    }
+                    //删除激活
+                    if(isActiva==1) {
+                        schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
+                    }
+                } else if ("全科目超级VIP".equals(order.getGoodsName())) {
+                    UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
+                    if (userVip != null) {
+                        //修改会员信息
+                        Date km1Date = userVip.getSubject1();
+                        if (km1Date != null) {  //存在会员时间
+                            long x = km1Date.getTime() - oneYearLong;
+                            Date km1oneYear = new Date(x);
+                            userVip.setSubject1(km1oneYear);
+                        }
+                        Date km2Date = userVip.getSubject2();
+                        if (km2Date != null) {  //存在会员时间
+                            long x = km2Date.getTime() - oneYearLong;
+                            Date km2oneYear = new Date(x);
+                            userVip.setSubject2(km2oneYear);
+                        }
+                        Date km3Date = userVip.getSubject3();
+                        if (km3Date != null) {  //存在会员时间
+                            long x = km3Date.getTime() - oneYearLong;
+                            Date km3oneYear = new Date(x);
+                            userVip.setSubject3(km3oneYear);
+                        }
+
+                        Date km4Date = userVip.getSubject4();
+                        if (km4Date != null) {  //存在会员时间
+                            long x = km4Date.getTime() - oneYearLong;
+                            Date km4oneYear = new Date(x);
+                            userVip.setSubject4(km4oneYear);
+                        }
+                        userVipService.updateById(userVip);
+                    }
+                    //删除激活
+                    if(isActiva==1) {
+                        schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
+                    }
+                }
+                int isShare = schPayConfigService.isSchPayConfigByUser(userInfo);
+                if (isShare == 1) {
+                    //如果是合作驾校插入消费记录表
+                    savePayLog(order, userInfo,2);
+                }
+                break;
+            case 2:
+                vipUserExamService.deleteVipUserExamByUserIdAndGoodsId(order.getUserId(),order.getGoodsId());
+                System.out.println("退未取消考场");
+                break;
+            default:
+                break;
 
-                Date km4Date = userVip.getSubject4();
-                if (km4Date != null) {  //存在会员时间
-                    long x = km4Date.getTime() - oneYearLong;
-                    Date km4oneYear = new Date(x);
-                    userVip.setSubject4(km4oneYear);
-                }
-                userVipService.updateById(userVip);
-            }
-            //删除激活
-            if(isActiva==1) {
-                schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
-            }
-        }
-        int isShare = schPayConfigService.isSchPayConfigByUser(userInfo);
-        if (isShare == 1) {
-            //如果是合作驾校插入消费记录表
-            savePayLog(order, userInfo,2);
         }
+
     }