|
@@ -709,6 +709,8 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
order.setPayingStatus(2);
|
|
|
}
|
|
|
if (order.getOrderDetailList() == null) continue;
|
|
|
+
|
|
|
+ BigDecimal organShareProfit = BigDecimal.ZERO;
|
|
|
for (StudentPaymentOrderDetail studentPaymentOrderDetail : order.getOrderDetailList()) {
|
|
|
if (studentPaymentOrderDetail.getGoodsList() == null) continue;
|
|
|
|
|
@@ -724,6 +726,21 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
if (studentPaymentOrderDetail.getType() == OrderDetailTypeEnum.CLOUD_TEACHER || studentPaymentOrderDetail.getType() == OrderDetailTypeEnum.CLOUD_TEACHER_PLUS) {
|
|
|
studentPaymentOrderDetail.setCloudTeacherOrderDto(cloudTeacherOrderService.queryOrderInfoByOrderId(studentPaymentOrderDetail.getPaymentOrderId()));
|
|
|
}
|
|
|
+
|
|
|
+ if (studentPaymentOrderDetail.getType() == OrderDetailTypeEnum.ORGAN_SHARE_PROFIT){
|
|
|
+ organShareProfit = organShareProfit.add(studentPaymentOrderDetail.getPrice());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ StudentPaymentOrderDetail spod = null;
|
|
|
+ Iterator<StudentPaymentOrderDetail> iterator = order.getOrderDetailList().iterator();
|
|
|
+ while(iterator.hasNext()){
|
|
|
+ spod = iterator.next();
|
|
|
+ if(spod.getType() == OrderDetailTypeEnum.MUSICAL){
|
|
|
+ spod.setPrice(spod.getPrice().add(organShareProfit));
|
|
|
+ }else if(spod.getType() == OrderDetailTypeEnum.ORGAN_SHARE_PROFIT){
|
|
|
+ iterator.remove();
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
return orders;
|