Ver Fonte

fix excel导入基类bug

周箭河 há 4 anos atrás
pai
commit
5c4097983c

+ 2 - 0
mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -1162,6 +1162,7 @@ public class ExportController extends BaseController {
                     row.setRepairFee(feeByType.getExpectAmount().subtract(feeByType.getMusicalFee()).subtract(feeByType.getTeachingFee()));
                 } else if (row.getType().equals(OrderTypeEnum.OUTORDER)) {
                     row.setCourseFee(feeByType.getExpectAmount().subtract(feeByType.getMusicalFee()).subtract(feeByType.getTeachingFee()));
+                    row.setTransferFee(BigDecimal.ZERO);
                 }
             }
             String paymentChannel = "";
@@ -2242,6 +2243,7 @@ public class ExportController extends BaseController {
                     row.setRepairFee(feeByType.getExpectAmount().subtract(feeByType.getMusicalFee()).subtract(feeByType.getTeachingFee()));
                 } else if (row.getType().equals(OrderTypeEnum.OUTORDER)) {
                     row.setCourseFee(feeByType.getExpectAmount().subtract(feeByType.getMusicalFee()).subtract(feeByType.getTeachingFee()));
+                    row.setTransferFee(BigDecimal.ZERO);
                 }
             }
             String paymentChannel = "";