|
@@ -379,7 +379,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
|
|
if (goods != null && goods.size() > 0) {
|
|
if (goods != null && goods.size() > 0) {
|
|
detail.setName(goods.stream().map(t -> t.getName()).collect(Collectors.joining(",")));
|
|
detail.setName(goods.stream().map(t -> t.getName()).collect(Collectors.joining(",")));
|
|
}
|
|
}
|
|
- detail.setPaymentOrderId((long) studentLastChange.getOriginalOrderId());
|
|
|
|
|
|
+ if(studentLastChange.getOriginalOrderId() != null){
|
|
|
|
+ detail.setPaymentOrderId((long) studentLastChange.getOriginalOrderId());
|
|
|
|
+ }
|
|
detail.setPrice(studentLastChange.getChangeMusicalPrice());
|
|
detail.setPrice(studentLastChange.getChangeMusicalPrice());
|
|
detail.setType(OrderDetailTypeEnum.MUSICAL);
|
|
detail.setType(OrderDetailTypeEnum.MUSICAL);
|
|
detail.setCreateTime(studentLastChange.getCreateTime());
|
|
detail.setCreateTime(studentLastChange.getCreateTime());
|