1

src/main/java/com/fdkankan/sale/service/impl/RepairInfoService.java

@@ -311,12 +311,12 @@ public class RepairInfoService {
             excelVo.setSort(i);
             BeanUtils.copyProperties(list,excelVo);
             if(list.getDiscount() == 0){
-                excelVo.setPriceDiscount(list.getPrice());
+                excelVo.setPrice(list.getPrice());
             }
             if(list.getDiscount() == 1){
-                excelVo.setPriceDiscount(list.getPriceDiscount());
+                excelVo.setPrice(list.getPriceDiscount());
             }
-            excelVo.setAmount(excelVo.getPriceDiscount().multiply(new BigDecimal(list.getCount())));
+            excelVo.setAmount(excelVo.getPrice().multiply(new BigDecimal(list.getCount())));
             excelVos.add(excelVo);
             totalAmount = totalAmount.add(excelVo.getAmount());
             priceData = list.getCreateTime();