|
@@ -1383,10 +1383,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|
long oneYearLong = 1000 * 60 * 60 * 24 * 365l;
|
|
long oneYearLong = 1000 * 60 * 60 * 24 * 365l;
|
|
Date now = new Date();
|
|
Date now = new Date();
|
|
|
|
|
|
- OrderInfo orderInfo = this.getByOutTradeNo(order.getOutTradeNo());
|
|
|
|
GzptUserInfo userInfo = userInfoService.getInfoById(order.getUserId());
|
|
GzptUserInfo userInfo = userInfoService.getInfoById(order.getUserId());
|
|
int isActiva = schActivationService.isSchActivation(userInfo.getOutId());
|
|
int isActiva = schActivationService.isSchActivation(userInfo.getOutId());
|
|
- if ("理论计时".equals(order.getGoodsName())) {
|
|
|
|
|
|
+ if ("理论实操计时".equals(order.getGoodsName())) {
|
|
//删除激活
|
|
//删除激活
|
|
if(isActiva!=1) {
|
|
if(isActiva!=1) {
|
|
delActiva(userInfo.getOutId());
|
|
delActiva(userInfo.getOutId());
|