订单导出

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentPaymentOrderExportDto.java

@@ -80,7 +80,7 @@ public class StudentPaymentOrderExportDto extends StudentPaymentOrder {
     private BigDecimal retailGoodsFee = BigDecimal.ZERO;
 
     @ApiModelProperty(value = "大件乐器费用",required = true)
-    private BigDecimal largeMusical = BigDecimal.ZERO;
+    private BigDecimal largeMusicalFee = BigDecimal.ZERO;
 
     //商品乐保
     @ApiModelProperty(value = "商品乐保",required = true)
@@ -209,12 +209,12 @@ public class StudentPaymentOrderExportDto extends StudentPaymentOrder {
         this.retailGoodsFee = retailGoodsFee;
     }
 
-    public BigDecimal getLargeMusical() {
-        return largeMusical;
+    public BigDecimal getLargeMusicalFee() {
+        return largeMusicalFee;
     }
 
-    public void setLargeMusical(BigDecimal largeMusical) {
-        this.largeMusical = largeMusical;
+    public void setLargeMusicalFee(BigDecimal largeMusicalFee) {
+        this.largeMusicalFee = largeMusicalFee;
     }
 
     public String getSchoolName() {

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

@@ -1820,6 +1820,10 @@ public class ExportServiceImpl implements ExportService {
                 }
             } else if (row.getGroupType().equals(GroupType.GOODS_SELL)) {
                 row.setRetailGoodsFee(row.getActualAmount());
+                row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RETAIL_GOODS);
+            } else if (row.getGroupType().equals(GroupType.OUTORDER)) {
+                row.setLargeMusicalFee(row.getActualAmount());
+                row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.LARGE_MUSICAL);
             } else {
                 StudentPaymentOrderExportDto feeByType = sellOrderDao.getFeeByType(row.getId());
                 BigDecimal childRepairFee = sellOrderDao.getChildRepair(row.getId());