Browse Source

优化生成合同的逻辑

master
dimengzhe 1 year ago
parent
commit
099adf89ac
  1. 24
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  2. 9
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java

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

@ -4664,6 +4664,30 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finBillApplicationDetailsVo.setCustomerName(commonContract.getPartyB());
finBillApplicationDetailsVo.setModelSid(commonContract.getModelSid());
finBillApplicationDetailsVo.setModelName(commonContract.getModelName());
//生成的合同下载地址
int contractBtns = 0;
//根据合同号查询销售订单数据
busSalesOrder = baseMapper.selectByContract(query.getContractNo());
SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(busSalesOrder.getSid()).getData();
BusSalesOrderModel busSalesOrderModel = baseMapper.selectByOrderSid(busSalesOrder.getSid());
BusSalesOrderPrice busSalesOrderPrice = baseMapper.selectByPrices(busSalesOrder.getSid());
if ("1".equals(busSalesOrder.getPayTypeKey())) {//全款
contractBtns = 1;
}else{
if(StringUtils.isNotBlank(loanSolutions.getTypeKey())){
contractBtns = 2;
}
}
finBillApplicationDetailsVo.setContractBtns(contractBtns);
//销售订单开票sid
if(StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())){
finBillApplicationDetailsVo.setOrderInvoiceSid(busSalesOrder.getAffiliatedCompanySid());
}
if(busSalesOrderPrice != null){
if(busSalesOrderPrice.getSingleFinalPrice() != null){
finBillApplicationDetailsVo.setOrderInvoicePrice(busSalesOrderPrice.getSingleFinalPrice().toString());
}
}
} else {
finBillApplicationDetailsVo = fetchDetailsVoBySid(sid);
}

9
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java

@ -112,4 +112,13 @@ public class AdvanceInvoiceInfoVo implements Vo {
private String saleSid;
@ApiModelProperty("是否显示价值客户")
private Boolean showValueCustomer;
// 下载地址
private String allDownloadUrl;
// 显示生成合同 下载合同按钮 全款/非耽误为true
private int contractBtns;
// 销售订单开票名称
private String orderInvoiceSid;
// 销售订单开票价格
private String orderInvoicePrice;
}

Loading…
Cancel
Save