优化

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java

@@ -30,4 +30,6 @@ public class BaseDistributorListVo implements Vo {
     private String openTickTypeKey;
     @ApiModelProperty("开票类型value")
     private String openTickTypeValue;
+    @ApiModelProperty("是否是企业")
+    private boolean companyIs;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -1293,6 +1293,7 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
                 openTickRemarks = openTickRemarks + baseDistributorListVo.getInvoBankNum() + "；";
             }
             baseDistributorListVo.setOpenTickRemarks(openTickRemarks);
+            baseDistributorListVo.setCompanyIs(true);
             baseDistributorListVos.add(baseDistributorListVo);
         }
         CrmCustomerTempListQuery crmCustomerTempListQuery = new CrmCustomerTempListQuery();
@@ -1309,6 +1310,7 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
             baseDistributorListVo.setRegistNum(crmCustomerTempListVo.getIdCard());
             baseDistributorListVo.setInvoPhone(crmCustomerTempListVo.getMobile());
             baseDistributorListVo.setNameAndPhone(crmCustomerTempListVo.getName() + crmCustomerTempListVo.getMobile());
+            baseDistributorListVo.setCompanyIs(false);
             baseDistributorListVos.add(baseDistributorListVo);
         }
         return rb.success().setData(baseDistributorListVos);

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

@@ -6967,7 +6967,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }*/
         if("1".equals(busSalesOrder.getPayTypeKey())){
             busSalesOrderIsDTKPJVo.setIsEdit(true);
-            busSalesOrderIsDTKPJVo.setOneBillMoney(busSalesOrder.getOneBillMoney().toString());
+            if(busSalesOrder.getOneBillMoney() != null){
+                busSalesOrderIsDTKPJVo.setOneBillMoney(busSalesOrder.getOneBillMoney().toString());
+            }
+
         }else{
             busSalesOrderIsDTKPJVo.setIsEdit(false);
             LoanSolutions loanSolutions = baseMapper.seletByOrderSid(busSalesOrder.getSid());

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

@@ -994,6 +994,11 @@ public class AppBusAdvanceGinvoiceapplyService {
         vo.setReasonKey(finBillApplicationDetailsVo.getArrearsOpenYYKey());
         vo.setReasonValue(finBillApplicationDetailsVo.getArrearsOpenYYValue());
         vo.setCollectionDate(finBillApplicationDetailsVo.getReturnedMoneyDate());
+        if ("是".equals(finBillApplicationDetailsVo.getIsLQOrigInvoice())){
+            vo.setGetOriginalKey("1");
+        }else if ("否".equals(finBillApplicationDetailsVo.getIsLQOrigInvoice())){
+            vo.setGetOriginalKey("0");
+        }
         vo.setGetOriginalValue(finBillApplicationDetailsVo.getIsLQOrigInvoice());
         vo.setProcInsId(finBillApplicationDetailsVo.getProcInstSid());
         vo.setInvoiceTotal(finBillApplicationDetailsVo.getArrearsMoney());
@@ -1085,12 +1090,14 @@ public class AppBusAdvanceGinvoiceapplyService {
         vo.setIdCardImages(idCardImages);
         vo.setArrearsCollectionAppendxs(qklpfjImages);
         BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData();
-        if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) {
+        /*if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) {
             vo.setIsCanEdit(false);
             vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
         } else {
             vo.setIsCanEdit(true);
-        }
+        }*/
+        vo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit());
+        vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
         return rb.success().setData(vo);
     }