yonge 2 years ago
parent
commit
a2fa8d263e

+ 11 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -434,6 +434,17 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
                 studentPaymentOrderDetailList.add(detail);
             }
+            if(studentLastChange.getChangeCourseFee() != null && studentLastChange.getChangeCourseFee().compareTo(BigDecimal.ZERO) > 0){
+            	StudentPaymentOrderDetail detail = new StudentPaymentOrderDetail();
+                if (studentLastChange.getOriginalOrderId() != null) {
+                    detail.setPaymentOrderId((long) studentLastChange.getOriginalOrderId());
+                }
+                detail.setPrice(studentLastChange.getChangeCourseFee());
+                detail.setType(OrderDetailTypeEnum.ORGAN_SHARE_PROFIT);
+                detail.setCreateTime(studentLastChange.getCreateTime());
+
+                studentPaymentOrderDetailList.add(detail);
+            }
         }
 
         return studentPaymentOrderDetailList;

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/SubjectChangeServiceImpl.java

@@ -353,7 +353,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
         	}
         }
         
-        if(changeGoodsList != null){
+        if(changeGoodsList.size() > 0){
             String goodsIdsStr = changeGoodsList.stream().map(t -> t.toString()).collect(Collectors.joining(","));
         	List<Goods> goodsList = goodsService.findGoodsByIds(goodsIdsStr);
         	Map<Integer,Goods> goodsMap = goodsList.stream().collect(Collectors.toMap(Goods :: getId, t -> t));