浏览代码

线上订单导出bug处理

zouxuan 1 年之前
父节点
当前提交
ac8d376cc4

+ 5 - 9
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -1969,19 +1969,15 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                                     row.setMusicGroupCourseFee(row.getMusicGroupCourseFee().add(orderDetail.getPrice()));
                                     break;
                                 case MUSICAL:
-                                    if(row.getGroupType() != GroupType.GOODS_SELL) {
-                                        if (orderDetail.getKitGroupPurchaseType() != null && orderDetail.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE)) {
-                                            row.setLeaseFee(getActualAmount(orderDetail.getPrice(), row));
-                                        } else {
-                                            row.setMusicalFee(orderDetail.getPrice());
-                                        }
+                                    if (orderDetail.getKitGroupPurchaseType() != null && orderDetail.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE)) {
+                                        row.setLeaseFee(getActualAmount(orderDetail.getPrice(), row));
+                                    } else {
+                                        row.setMusicalFee(orderDetail.getPrice());
                                     }
                                     break;
                                 case ACCESSORIES:
                                 case TEACHING:
-                                    if(row.getGroupType() != GroupType.GOODS_SELL){
-                                        row.setTeachingFee(row.getTeachingFee().add(orderDetail.getPrice()));
-                                    }
+                                    row.setTeachingFee(row.getTeachingFee().add(orderDetail.getPrice()));
                                     break;
                                 case OTHER:
                                     row.setOtherFee(row.getOtherFee().add(orderDetail.getPrice()));