|
@@ -92,14 +92,14 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|
|
|
|
|
|
|
|
GzptUserInfo userInfo = userInfoService.getInfoById(order.getUserId());
|
|
|
- int isActiva = schActivationService.isSchActivation(userInfo.getOutId());
|
|
|
+ int isActiva = schActivationService.isSchActivation(order.getUserId());
|
|
|
if ("理论实操计时".equals(order.getGoodsName())) {
|
|
|
//激活操作
|
|
|
if(isActiva==0) { //未激活
|
|
|
saveActiva(order, userInfo);
|
|
|
this.save(orderInfo);
|
|
|
} else if (isActiva==2) { //激活过,退款
|
|
|
- schActivationService.upDelSchActivationByStuId(userInfo.getOutId(),0);
|
|
|
+ schActivationService.upDelSchActivationByUserId(order.getUserId(),0);
|
|
|
}
|
|
|
} else if ("科一专项VIP(含计时)".equals(order.getGoodsName())) {
|
|
|
UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
|
|
@@ -1345,11 +1345,11 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|
|
Date now = new Date();
|
|
|
|
|
|
GzptUserInfo userInfo = userInfoService.getInfoById(order.getUserId());
|
|
|
- int isActiva = schActivationService.isSchActivation(userInfo.getOutId());
|
|
|
+ int isActiva = schActivationService.isSchActivation(order.getUserId());
|
|
|
if ("理论实操计时".equals(order.getGoodsName())) {
|
|
|
//删除激活
|
|
|
if(isActiva==1) {
|
|
|
- schActivationService.upDelSchActivationByStuId(userInfo.getOutId(),1);
|
|
|
+ schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
|
|
|
}
|
|
|
} else if ("科一专项VIP(含计时)".equals(order.getGoodsName())) {
|
|
|
UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
|
|
@@ -1365,7 +1365,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|
|
}
|
|
|
//删除激活
|
|
|
if(isActiva==1) {
|
|
|
- schActivationService.upDelSchActivationByStuId(userInfo.getOutId(),1);
|
|
|
+ schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
|
|
|
}
|
|
|
} else if ("科一专项VIP".equals(order.getGoodsName())) {
|
|
|
UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
|
|
@@ -1393,7 +1393,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|
|
}
|
|
|
//删除激活
|
|
|
if(isActiva==1) {
|
|
|
- schActivationService.upDelSchActivationByStuId(userInfo.getOutId(),1);
|
|
|
+ schActivationService.upDelSchActivationByUserId(userInfo.getOutId(),1);
|
|
|
}
|
|
|
} else if ("科二专项VIP".equals(order.getGoodsName())) {
|
|
|
UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
|
|
@@ -1421,7 +1421,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|
|
}
|
|
|
//删除激活
|
|
|
if(isActiva==1) {
|
|
|
- schActivationService.upDelSchActivationByStuId(userInfo.getOutId(),1);
|
|
|
+ schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
|
|
|
}
|
|
|
} else if ("科三专项VIP".equals(order.getGoodsName())) {
|
|
|
UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
|
|
@@ -1449,7 +1449,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|
|
}
|
|
|
//删除激活
|
|
|
if(isActiva==1) {
|
|
|
- schActivationService.upDelSchActivationByStuId(userInfo.getOutId(),1);
|
|
|
+ schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
|
|
|
}
|
|
|
} else if ("科四专项VIP".equals(order.getGoodsName())) {
|
|
|
UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
|
|
@@ -1514,7 +1514,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|
|
}
|
|
|
//删除激活
|
|
|
if(isActiva==1) {
|
|
|
- schActivationService.upDelSchActivationByStuId(userInfo.getOutId(),1);
|
|
|
+ schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
|
|
|
}
|
|
|
} else if ("科一+科四VIP".equals(order.getGoodsName())) {
|
|
|
UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
|
|
@@ -1554,7 +1554,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|
|
}
|
|
|
//删除激活
|
|
|
if(isActiva==1) {
|
|
|
- schActivationService.upDelSchActivationByStuId(userInfo.getOutId(),1);
|
|
|
+ schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
|
|
|
}
|
|
|
} else if ("科二+科三VIP".equals(order.getGoodsName())) {
|
|
|
UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
|
|
@@ -1600,7 +1600,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|
|
}
|
|
|
//删除激活
|
|
|
if(isActiva==1) {
|
|
|
- schActivationService.upDelSchActivationByStuId(userInfo.getOutId(),1);
|
|
|
+ schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
|
|
|
}
|
|
|
} else if ("科二+科三+科四".equals(order.getGoodsName())) {
|
|
|
UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
|
|
@@ -1646,7 +1646,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|
|
}
|
|
|
//删除激活
|
|
|
if(isActiva==1) {
|
|
|
- schActivationService.upDelSchActivationByStuId(userInfo.getOutId(),1);
|
|
|
+ schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
|
|
|
}
|
|
|
} else if ("科三+科四VIP".equals(order.getGoodsName())) {
|
|
|
UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
|
|
@@ -1699,7 +1699,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|
|
}
|
|
|
//删除激活
|
|
|
if(isActiva==1) {
|
|
|
- schActivationService.upDelSchActivationByStuId(userInfo.getOutId(),1);
|
|
|
+ schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
|
|
|
}
|
|
|
} else if ("全科目超级VIP".equals(order.getGoodsName())) {
|
|
|
UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
|
|
@@ -1734,7 +1734,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|
|
}
|
|
|
//删除激活
|
|
|
if(isActiva==1) {
|
|
|
- schActivationService.upDelSchActivationByStuId(userInfo.getOutId(),1);
|
|
|
+ schActivationService.upDelSchActivationByUserId(order.getUserId(),1);
|
|
|
}
|
|
|
}
|
|
|
int isShare = schPayConfigService.isSchPayConfigByUser(userInfo);
|
|
@@ -1781,8 +1781,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|
|
schActivationService.saveSchActivation(schActivation);
|
|
|
}
|
|
|
|
|
|
- private void delActiva(Long stuId) {
|
|
|
- schActivationService.delSchActivationByStuId(stuId);
|
|
|
+ private void delActiva(Long userId) {
|
|
|
+ schActivationService.delSchActivationByUserId(userId);
|
|
|
}
|
|
|
|
|
|
}
|