Browse Source

订单导出bug修复,产生的原因:原来的商品销售没有详情,详情会被记录到乐器金额,或者乐器押金

zouxuan 2 years ago
parent
commit
80edc8408a

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

@@ -1749,10 +1749,12 @@ public class ExportServiceImpl implements ExportService {
                             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: