小班课修改

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -224,7 +224,7 @@ public class MusicGroupController extends BaseController {
         //获取课程价格
         MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(studentRegistration.getMusicGroupId(), studentRegistration.getSubjectId());
         BigDecimal courseFee = musicOneSubjectClassPlan.getFee();
-        if(studentRegistration.getTemporaryCourseFee() != null){
+        if (studentRegistration.getTemporaryCourseFee() != null) {
             courseFee = studentRegistration.getTemporaryCourseFee();
         }
         orderAmount = orderAmount.add(courseFee);
@@ -232,16 +232,19 @@ public class MusicGroupController extends BaseController {
 
         //乐器及打包辅件
         List<MusicGroupSubjectGoodsGroup> goodsGroups = null;
-        if (registerPayDto.getGoodsGroupIds() != null && !registerPayDto.getGoodsGroupIds().equals("")) GROUP: {
-            if(studentRegistration.getTemporaryCourseFee() != null){
-                List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailService.findUserApplyOrder(studentRegistration.getUserId(), DealStatusEnum.WAIT_PAY);
-                for (StudentPaymentOrderDetail orderDetail : orderDetails) {
-                    orderAmount = orderAmount.add(orderDetail.getPrice());
-                    continue;
-                }
-                break GROUP;
-            }
 
+        if (studentRegistration.getTemporaryCourseFee() != null) {
+            List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailService.findUserApplyOrder(studentRegistration.getUserId(), DealStatusEnum.WAIT_PAY);
+            for (StudentPaymentOrderDetail orderDetail : orderDetails) {
+                MusicGroupSubjectGoodsGroup musicGroupSubjectGoodsGroup = new MusicGroupSubjectGoodsGroup();
+                GoodsType goodsType = orderDetail.getType().equals(OrderDetailTypeEnum.MUSICAL) ? GoodsType.INSTRUMENT : GoodsType.ACCESSORIES;
+                musicGroupSubjectGoodsGroup.setType(goodsType);
+                musicGroupSubjectGoodsGroup.setGoodsIdList(orderDetail.getGoodsIdList());
+                musicGroupSubjectGoodsGroup.setPrice(orderDetail.getPrice());
+                goodsGroups.add(musicGroupSubjectGoodsGroup);
+                orderAmount = orderAmount.add(orderDetail.getPrice());
+            }
+        } else if (registerPayDto.getGoodsGroupIds() != null && !registerPayDto.getGoodsGroupIds().equals("")) {
             goodsGroups = musicGroupSubjectGoodsGroupService.findGoodsGroupByIds(registerPayDto.getGoodsGroupIds());
             for (MusicGroupSubjectGoodsGroup goodsGroup : goodsGroups) {
                 if (goodsGroup.getType().equals(GoodsType.INSTRUMENT) && musicOneSubjectClassPlan.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE)) {
@@ -324,7 +327,7 @@ public class MusicGroupController extends BaseController {
         //获取课程价格
         MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(studentRegistration.getMusicGroupId(), studentRegistration.getSubjectId());
         BigDecimal courseFee = musicOneSubjectClassPlan.getFee();
-        if(studentRegistration.getTemporaryCourseFee() != null){
+        if (studentRegistration.getTemporaryCourseFee() != null) {
             courseFee = studentRegistration.getTemporaryCourseFee();
         }
         orderAmount = orderAmount.add(courseFee);
@@ -332,15 +335,18 @@ public class MusicGroupController extends BaseController {
 
         //乐器及打包辅件
         List<MusicGroupSubjectGoodsGroup> goodsGroups = null;
-        if (registerPayDto.getGoodsGroupIds() != null && !registerPayDto.getGoodsGroupIds().equals("")) GROUP: {
-            if(studentRegistration.getTemporaryCourseFee() != null){
-                List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailService.findUserApplyOrder(studentRegistration.getUserId(), DealStatusEnum.WAIT_PAY);
-                for (StudentPaymentOrderDetail orderDetail : orderDetails) {
-                    orderAmount = orderAmount.add(orderDetail.getPrice());
-                    continue;
-                }
-                break GROUP;
+        if (studentRegistration.getTemporaryCourseFee() != null) {
+            List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailService.findUserApplyOrder(studentRegistration.getUserId(), DealStatusEnum.WAIT_PAY);
+            for (StudentPaymentOrderDetail orderDetail : orderDetails) {
+                MusicGroupSubjectGoodsGroup musicGroupSubjectGoodsGroup = new MusicGroupSubjectGoodsGroup();
+                GoodsType goodsType = orderDetail.getType().equals(OrderDetailTypeEnum.MUSICAL) ? GoodsType.INSTRUMENT : GoodsType.ACCESSORIES;
+                musicGroupSubjectGoodsGroup.setType(goodsType);
+                musicGroupSubjectGoodsGroup.setGoodsIdList(orderDetail.getGoodsIdList());
+                musicGroupSubjectGoodsGroup.setPrice(orderDetail.getPrice());
+                goodsGroups.add(musicGroupSubjectGoodsGroup);
+                orderAmount = orderAmount.add(orderDetail.getPrice());
             }
+        } else if (registerPayDto.getGoodsGroupIds() != null && !registerPayDto.getGoodsGroupIds().equals("")) {
             goodsGroups = musicGroupSubjectGoodsGroupService.findGoodsGroupByIds(registerPayDto.getGoodsGroupIds());
             for (MusicGroupSubjectGoodsGroup goodsGroup : goodsGroups) {
                 if (goodsGroup.getType().equals(GoodsType.INSTRUMENT) && musicOneSubjectClassPlan.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE)) {