优化

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java

@@ -36,6 +36,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppModelInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply;
+import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
@@ -227,4 +228,6 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
     String selectByBusSid(String sid);
 
     String selectByBusVinSid(String sid);
+
+    LoanSolutions seletByOrderSid(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -614,4 +614,8 @@
         from anrui_fin.fin_uncollected_receivables_detailed
         where busVinSid = #{busVinSid}
     </select>
+
+    <select id="seletByOrderSid" resultType="com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions">
+        select * from anrui_riskcenter.loan_solutions where salesOrderSid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -6957,13 +6957,25 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         ResultBean rb = ResultBean.fireFail();
         BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = new BusSalesOrderIsDTKPJVo();
         BusSalesOrder busSalesOrder = baseMapper.selectOrderByContractNo(contractNo);
-        BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
+       /* BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
         if (oneBillMoney == null) {
             busSalesOrderIsDTKPJVo.setIsEdit(false);
             busSalesOrderIsDTKPJVo.setOneBillMoney("");
         } else {
             busSalesOrderIsDTKPJVo.setIsEdit(true);
             busSalesOrderIsDTKPJVo.setOneBillMoney(busSalesOrder.getOneBillMoney().toString());
+        }*/
+        if("1".equals(busSalesOrder.getPayTypeKey())){
+            busSalesOrderIsDTKPJVo.setIsEdit(true);
+            busSalesOrderIsDTKPJVo.setOneBillMoney(busSalesOrder.getOneBillMoney().toString());
+        }else{
+            busSalesOrderIsDTKPJVo.setIsEdit(false);
+            LoanSolutions loanSolutions = baseMapper.seletByOrderSid(busSalesOrder.getSid());
+            if(loanSolutions != null){
+                if(loanSolutions.getMainVehicleAmount() != null){
+                    busSalesOrderIsDTKPJVo.setOneBillMoney(loanSolutions.getMainVehicleAmount().toString());
+                }
+            }
         }
         return rb.success().setData(busSalesOrderIsDTKPJVo);
     }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

@@ -1568,7 +1568,7 @@ public class AppBusAdvanceGinvoiceapplyService {
                 ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo();
                 itemEditTextInfo.setTitle("《责任人担保承诺书》");
                 itemEditTextInfo.setType(1);
-                itemEditTextInfo.setNullAble(true);
+                itemEditTextInfo.setNullAble(false);
                 itemEditTextInfo.setKey("zrrdbcns");
                 itemEditTextInfo.setFilesPath(zrrdbcns);
                 itemEditTextInfos.add(itemEditTextInfo);