线上订单导出bug处理

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

@@ -2425,19 +2425,23 @@ public class ExportServiceImpl implements ExportService {
                             row.setMusicGroupCourseFee(row.getMusicGroupCourseFee().add(orderDetail.getPrice()));
                             break;
                         case MUSICAL:
-                            if (orderDetail.getKitGroupPurchaseType() != null && orderDetail.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE)) {
-                                BigDecimal leaseFee = BigDecimal.ZERO;
-                                if (row.getExpectAmount().compareTo(BigDecimal.ZERO) > 0) {
-                                    leaseFee = orderDetail.getPrice().multiply(row.getActualAmount()).divide(row.getExpectAmount(), 2, BigDecimal.ROUND_DOWN);
+                            if (row.getGroupType() != GroupType.GOODS_SELL) {
+                                if (orderDetail.getKitGroupPurchaseType() != null && orderDetail.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE)) {
+                                    BigDecimal leaseFee = BigDecimal.ZERO;
+                                    if (row.getExpectAmount().compareTo(BigDecimal.ZERO) > 0) {
+                                        leaseFee = orderDetail.getPrice().multiply(row.getActualAmount()).divide(row.getExpectAmount(), 2, BigDecimal.ROUND_DOWN);
+                                    }
+                                    row.setLeaseFee(leaseFee);
+                                } else {
+                                    row.setMusicalFee(orderDetail.getPrice());
                                 }
-                                row.setLeaseFee(leaseFee);
-                            } else {
-                                row.setMusicalFee(orderDetail.getPrice());
                             }
                             break;
                         case ACCESSORIES:
                         case TEACHING:
-                            row.setTeachingFee(row.getTeachingFee().add(orderDetail.getPrice()));
+                            if (row.getGroupType() != GroupType.GOODS_SELL) {
+                                row.setTeachingFee(row.getTeachingFee().add(orderDetail.getPrice()));
+                            }
                             break;
                         case OTHER:
                             row.setOtherFee(row.getOtherFee().add(orderDetail.getPrice()));

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

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