update

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

@@ -583,6 +583,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
 	                studentPaymentOrderDetail.setCreateTime(nowDate);
 	                if(goods.getType() == GoodsType.INSTRUMENT){
 	                	studentPaymentOrderDetail.setType(OrderDetailTypeEnum.MUSICAL);
+	                	studentPaymentOrderDetail.setKitGroupPurchaseType(subjectChange.getKitGroupPurchaseType());
 	                }else if(goods.getType() == GoodsType.ACCESSORIES){
 	                	studentPaymentOrderDetail.setType(OrderDetailTypeEnum.ACCESSORIES);
 	                }else if(goods.getType() == GoodsType.TEACHING || goods.getType() == GoodsType.STAFF){
@@ -684,6 +685,18 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
 	                }
 	                
 	                studentPaymentOrderDetailList.add(studentPaymentOrderDetail);
+	                
+	                //分部分润
+	                if(subjectChange.getChangeCourseFee().compareTo(BigDecimal.ZERO) > 0 && studentPaymentOrderDetail.getKitGroupPurchaseType() == KitGroupPurchaseTypeEnum.GROUP) {
+	                	StudentPaymentOrderDetail spod = new StudentPaymentOrderDetail();
+	                    spod.setType(OrderDetailTypeEnum.ORGAN_SHARE_PROFIT);
+	                    spod.setPrice(subjectChange.getChangeCourseFee());
+	                    spod.setRemitFee(BigDecimal.ZERO);
+	                    spod.setCreateTime(nowDate);
+	                    spod.setUpdateTime(nowDate);
+	                    spod.setPaymentOrderId(studentPaymentOrder.getId());
+	                    studentPaymentOrderDetailList.add(spod);
+	                }
 				}
         	}
             
@@ -771,6 +784,8 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
         //1、存在历史的更换
         SubjectChange studentLastChange = subjectChangeDao.getStudentLastChange(studentId, musicGroupId);
         if (studentLastChange != null) {
+        	studentLastChange.setChangeAccessoriesGoods(goodsDao.findGoodsByIds(studentLastChange.getChangeAccessories()));
+        	studentLastChange.setChangeMusicalGoods(goodsDao.get(studentLastChange.getChangeMusical()));
         	return studentLastChange;
         }
         //2.1不存在历史的更换