优化

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@@ -44,6 +44,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -237,9 +238,10 @@ public class InvoicedService {
         BusDeliveredApply busDeliveredApply = busDeliveredApplyFeign.fetchBySid(query.getSid()).getData();
         List<BusDeliveredApplyDetails> busDeliveredApplyDetails = busDeliveredApplyDetailsFeign.selectByApplySid(query.getSid()).getData();
         if (data != null) {
+            billApplicationIInfoVo.setModelSid(busDeliveredApply.getModelSid());
+            billApplicationIInfoVo.setModelName(busDeliveredApply.getModelName());
             billApplicationIInfoVo.setSid(data.getSid());
             billApplicationIInfoVo.setProcInsId(data.getProcInstSid());
-            billApplicationIInfoVo.setInvoiceTotal(data.getTotalBillMoney());
             billApplicationIInfoVo.setOrgPath(data.getOrgSidPath());
             billApplicationIInfoVo.setSaleType(data.getSaleTypeValue());
             billApplicationIInfoVo.setSellerDept(data.getSaleDeptName());
@@ -328,6 +330,9 @@ public class InvoicedService {
                     registerContractImages.add(cldjhtApplicationAppendx.getFileUrl());
                 }
             }
+            if (StringUtils.isNotBlank(data.getOneBillMoney())){
+                billApplicationIInfoVo.setInvoiceTotal(new BigDecimal(data.getOneBillMoney()).multiply(new BigDecimal(busBillVehicleVos.size())).toString());
+            }
             billApplicationIInfoVo.setCarBuyContractImages(appCarBuyContractImages);
             billApplicationIInfoVo.setCustomerInvoiceApplyImages(customerInvoiceApplyImages);
             billApplicationIInfoVo.setInvoiceApplyConfirmImages(invoiceApplyConfirmImages);
@@ -341,6 +346,8 @@ public class InvoicedService {
                 billApplicationIInfoVo.setIsCanEdit(true);
             }
         }else {
+            billApplicationIInfoVo.setModelSid(busDeliveredApply.getModelSid());
+            billApplicationIInfoVo.setModelName(busDeliveredApply.getModelName());
             billApplicationIInfoVo.setProcInsId(busDeliveredApply.getProcInstId());
             billApplicationIInfoVo.setOrgPath(busDeliveredApply.getOrgSidPath());
             billApplicationIInfoVo.setSaleType(busDeliveredApply.getPaymentMethodKey());