出库开票生成合同

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java

@@ -525,9 +525,9 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
         if(StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())){
             vo.setOrderInvoiceSid(busSalesOrder.getAffiliatedCompanySid());
         }
-        if(loanSolutions != null){
-            if(StringUtils.isNotBlank(loanSolutions.getMainVehicleAmount())){
-                vo.setOrderInvoicePrice(loanSolutions.getMainVehicleAmount());
+        if(busSalesOrderPrice != null){
+            if(busSalesOrderPrice.getSingleFinalPrice() != null){
+                vo.setOrderInvoicePrice(busSalesOrderPrice.getSingleFinalPrice().toString());
             }
         }
         return vo;

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -1162,7 +1162,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
 
                 if("1".equals(busSalesOrder.getPayTypeKey())){
                     if (loanSolutions != null) {
-                        if (!dto.getOneBillMoney().equals(loanSolutions.getMainVehicleAmount())) {
+                        if (busSalesOrderPrice.getSingleFinalPrice().compareTo(new BigDecimal(dto.getOneBillMoney())) != 0) {
                             String remarks = "";
                             String date = DateUtil.today();
                             List<String> dateString = Arrays.asList(date.split("-"));
@@ -1701,9 +1701,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         if(StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())){
             vo.setOrderInvoiceSid(busSalesOrder.getAffiliatedCompanySid());
         }
-        if(loanSolutions != null){
-            if(StringUtils.isNotBlank(loanSolutions.getMainVehicleAmount())){
-                vo.setOrderInvoicePrice(loanSolutions.getMainVehicleAmount());
+        if(busSalesOrderPrice != null){
+            if(busSalesOrderPrice.getSingleFinalPrice() != null){
+                vo.setOrderInvoicePrice(busSalesOrderPrice.getSingleFinalPrice().toString());
             }
         }
         return vo;