|
@@ -1467,6 +1467,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
Integer userId = order.getUserId();
|
|
Integer userId = order.getUserId();
|
|
boolean isOk=order.getStatus().equals(DealStatusEnum.SUCCESS);
|
|
boolean isOk=order.getStatus().equals(DealStatusEnum.SUCCESS);
|
|
|
|
|
|
|
|
+ StudentPaymentOrder studentPaymentOrder = studentPaymentOrderDao.lockOrder(order.getId());
|
|
|
|
+
|
|
List<StudentPaymentOrder> userOrders = studentPaymentOrderDao.findUserBuyVipGroupOrder(userId, vipGroupId.intValue());
|
|
List<StudentPaymentOrder> userOrders = studentPaymentOrderDao.findUserBuyVipGroupOrder(userId, vipGroupId.intValue());
|
|
Map<DealStatusEnum, List<StudentPaymentOrder>> statusOrdersMap = userOrders.stream().collect(Collectors.groupingBy(StudentPaymentOrder::getStatus));
|
|
Map<DealStatusEnum, List<StudentPaymentOrder>> statusOrdersMap = userOrders.stream().collect(Collectors.groupingBy(StudentPaymentOrder::getStatus));
|
|
if(!CollectionUtils.isEmpty(statusOrdersMap.get(DealStatusEnum.SUCCESS))){
|
|
if(!CollectionUtils.isEmpty(statusOrdersMap.get(DealStatusEnum.SUCCESS))){
|
|
@@ -1474,7 +1476,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
- StudentPaymentOrder studentPaymentOrder = studentPaymentOrderDao.get(order.getId());
|
|
|
|
if(studentPaymentOrder.getStatus().equals(DealStatusEnum.SUCCESS)){
|
|
if(studentPaymentOrder.getStatus().equals(DealStatusEnum.SUCCESS)){
|
|
return;
|
|
return;
|
|
}
|
|
}
|