update

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

@@ -403,9 +403,9 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                         if (subjectChange.getChangeMusical() == null) {
                             continue;
                         }
-                        kitGroupPurchaseType = subjectChange.getKitGroupPurchaseType();
-                        musicalId = subjectChange.getChangeMusical() + "";
                         if(spod.getType() == OrderDetailTypeEnum.MUSICAL){
+                            kitGroupPurchaseType = subjectChange.getKitGroupPurchaseType();
+                            musicalId = subjectChange.getChangeMusical() + "";
                             spod.setPrice(subjectChange.getChangeMusicalPrice());
                         }else{
                         	if(subjectChange.getKitGroupPurchaseType() == KitGroupPurchaseTypeEnum.GROUP){
@@ -415,8 +415,10 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                         spod.setRemitFee(BigDecimal.ZERO);
                         isChangeMusical = true;
                     } else {
-                        kitGroupPurchaseType = spod.getKitGroupPurchaseType();
-                        musicalId = spod.getGoodsIdList();
+						if (spod.getType() == OrderDetailTypeEnum.MUSICAL) {
+							kitGroupPurchaseType = spod.getKitGroupPurchaseType();
+							musicalId = spod.getGoodsIdList();
+						}
                         //musicalAmount = musicalAmount.add(spod.getPrice());
                     }
                     spod.setType(OrderDetailTypeEnum.MUSICAL);

mec-biz/src/main/resources/config/mybatis/SubjectChangeMapper.xml

@@ -380,7 +380,7 @@
                GROUP_CONCAT(sc.change_musical_)       trans_no_,
                GROUP_CONCAT(sc.change_accessories_)   change_accessories_
         FROM subject_change sc
-                 LEFT JOIN student_registration sr ON sc.student_id_ = sr.user_id_
+                 LEFT JOIN student_registration sr ON sc.student_id_ = sr.user_id_ and sc.music_group_id_ = sr.music_group_id_
         WHERE sc.music_group_id_ = #{musicGroupId}
           AND sc.status_ = 2
           AND sr.music_group_status_ != 'QUIT'