详情增加支付金额

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

@@ -116,7 +116,6 @@ public class RepairCustomerService {
         repairInvoice = new RepairInvoice();
         BeanUtils.copyProperties(param,repairInvoice);
         repairInvoiceService.save(repairInvoice);
-        repairService.updateInvoiceStatus(param.getRepairId());
 
     }
 

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

@@ -11,6 +11,7 @@ import com.fdkankan.sale.exception.BusinessException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Service
@@ -68,6 +69,15 @@ public class RepairInfoService {
             detailVo.setApplyInvoice(1);
         }
 
+        BigDecimal payAmount = BigDecimal.ZERO;
+        if(repair.getStatus() == 4){
+            payAmount = priceListService.getRobAmountByRepairId(repair.getRepairId());
+        }
+        if(repair.getStatus() == 9){
+            payAmount = priceListService.getAmountByRepairId(repair.getRepairId());
+        }
+        detailVo.setPayAmount(payAmount);
+
         detailVo.setCustomer(customer);
         detailVo.setCustomerAddress(customerAddress);
         detailVo.setRepairerVo(repairer);

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

@@ -11,6 +11,7 @@ import com.fdkankan.sale.mapper.IRepairInvoiceMapper;
 import com.fdkankan.sale.service.IMailTemplateService;
 import com.fdkankan.sale.service.IRepairInvoiceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.sale.service.IRepairService;
 import com.fdkankan.sale.vo.request.RepairInvoiceParam;
 import com.fdkankan.sale.vo.response.RepairInvoiceVo;
 import org.apache.commons.lang3.StringUtils;
@@ -30,6 +31,8 @@ public class RepairInvoiceServiceImpl extends ServiceImpl<IRepairInvoiceMapper,
 
     @Autowired
     IMailTemplateService mailTemplateService;
+    @Autowired
+    IRepairService repairService;
 
 
     @Override
@@ -88,7 +91,7 @@ public class RepairInvoiceServiceImpl extends ServiceImpl<IRepairInvoiceMapper,
             wrapper.set(RepairInvoice::getSysUserId,userId);
             this.update(wrapper);
         }
-
+        repairService.updateInvoiceStatus(param.getRepairId());
     }
 
 

src/main/java/com/fdkankan/sale/vo/response/RepairDetailVo.java

@@ -1,8 +1,10 @@
 package com.fdkankan.sale.vo.response;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fdkankan.sale.entity.*;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 
@@ -35,4 +37,7 @@ public class RepairDetailVo {
 
     private Integer applyInvoice = 0;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private BigDecimal payAmount;
+
 }