Browse Source

优化

zhanglei
dimengzhe 2 years ago
parent
commit
c6bf56dc47
  1. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillvehicle/BusBillVehicleMapper.java
  2. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillvehicle/BusBillVehicleMapper.xml
  3. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillvehicle/BusBillVehicleService.java
  4. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  5. 134
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillvehicle/BusBillVehicleMapper.java

@ -67,4 +67,6 @@ public interface BusBillVehicleMapper extends BaseMapper<BusBillVehicle> {
List<BusBillVehicleVo> fetchByMainSid(String sid);
List<String> fetchByUseOrgSid(@Param(Constants.WRAPPER) Wrapper<BusBillVehicle> qw);
BusBillVehicle selectOnes(@Param("sid") String sid, @Param("vinSid") String vinSid);
}

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillvehicle/BusBillVehicleMapper.xml

@ -43,4 +43,8 @@
AND fba.`nodeState` != "待提交"
AND fba.`nodeState` != "终止"
</select>
<select id="selectOnes" resultType="com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicle">
select * from bus_bill_vehicle where billAppSid = #{sid} and vehSid = #{vinSid}
</select>
</mapper>

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillvehicle/BusBillVehicleService.java

@ -142,4 +142,8 @@ public class BusBillVehicleService extends MybatisBaseService<BusBillVehicleMapp
qw.ne("fba.nodeState","终止");
return baseMapper.fetchByUseOrgSid(qw);
}
public BusBillVehicle selectOnes(String sid, String vinSid) {
return baseMapper.selectOnes(sid,vinSid);
}
}

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@ -59,6 +59,7 @@ import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationDetailsV
import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationDto;
import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationVo;
import com.yxt.anrui.buscenter.api.busbilltrailer.BusBillTrailerVo;
import com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicle;
import com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicleVo;
import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo;
import com.yxt.anrui.buscenter.api.busdelivered.BusDelivered;
@ -1297,7 +1298,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
//根据合同和车辆sid获取欠款开票的信息
BusBillApplication busBillApplication = busBillApplicationService.selectByContractNoAndSid(busDeliveredApply.getContractNo(), busDeliveredApplyDetails.getVinSid());
if (busBillApplication != null) {
if ("02".equals(busBillApplication.getOpenTickTypeKey())) {
BusBillVehicle busBillVehicle = busBillVehicleService.selectOnes(busBillApplication.getSid(),busDeliveredApplyDetails.getVinSid());
if ("02".equals(busBillVehicle.getBillTypeKey())) {
if (!data.getSingleFinalPrice().equals(busBillApplication.getOneBillMoney())) {
//若高低开,推送价值客户备案
BusValcustFilingDto busValcustFilingDto = new BusValcustFilingDto();

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

@ -2624,8 +2624,136 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
if ("01".equals(finBillApplication.getOpenTickTypeKey())) {//判断是否为机动车销售统一发票
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid);
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid);
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid);
for (int i = 0; i < finBillVehicleVos.size(); i++) {
FinBillVehicleVo finBillVehicleVo = finBillVehicleVos.get(i);
if("01".equals(finBillVehicleVo.getBillTypeKey())){//判断是否为机动车销售统一发票
if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())) {//是高低开
BusValcustFilingDto busValcustFilingDto = new BusValcustFilingDto();
busValcustFilingDto.setCreateBySid(finBillApplication.getCreateBySid());
busValcustFilingDto.setCreateByName(finBillApplication.getCreateByName());
busValcustFilingDto.setOrgSidPath(finBillApplication.getOrgSidPath());
busValcustFilingDto.setUseOrgSid(finBillApplication.getUseOrgSid());
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(finBillApplication.getUseOrgSid()).getData();
busValcustFilingDto.setUseOrgName(sysOrganizationVo.getName());
busValcustFilingDto.setApplyDeptSid(finBillApplication.getDeptSid());
busValcustFilingDto.setApplyDeptName(finBillApplication.getDeptName());
busValcustFilingDto.setContractNo(finBillApplication.getContractNo());
busValcustFilingDto.setModelSid(finBillApplication.getModelSid());
busValcustFilingDto.setModelName(finBillApplication.getModelName());
busValcustFilingDto.setVinSid(finBillVehicleVo.getVehSid());
busValcustFilingDto.setVinNo(finBillVehicleVo.getVinNo());
BigDecimal money = finBillApplication.getOneBillMoney().subtract(data.getSingleFinalPrice());
int j = money.compareTo(BigDecimal.ZERO);
if (j == 1) {
busValcustFilingDto.setIsGdk("0");
String parameterValue = sysParameterFeign.fetchByParNo("CW_JZPZSXFBL").getData();
busValcustFilingDto.setYsMoney(money.multiply(new BigDecimal(parameterValue)).toString());
} else {
busValcustFilingDto.setIsGdk("1");
busValcustFilingDto.setYsMoney("0");
}
busValcustFilingDto.setMoney(money.abs().toString());
busValcustFilingDto.setSaleOrderSid(busSalesOrder.getSid());
busValcustFilingDto.setBusSid(finBillApplication.getSid());
busValcustFilingDto.setBusSource("0");
busValcustFilingFeign.save(busValcustFilingDto);
}else{
int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid());
if (count == 0) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid());
finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo());
finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey());
finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue());
finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney());
finVehicleInvoiceDto.setBillingStateKey("001");
finVehicleInvoiceDto.setBillingState("未开票");
finVehicleInvoiceDto.setTransferStateKey("001");
finVehicleInvoiceDto.setTransferState("未移交");
finVehicleInvoiceDto.setVehicleType("主车");
finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData();
if (busArrearsCarryVehicleApplyVo == null) {
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
} else {
finVehicleInvoiceDto.setBusinessStateKey("005");
finVehicleInvoiceDto.setBusinessState("欠款提车");
}
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid());
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
} else {
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData();
if (crmCustomerTempVo != null) {
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
}
}
finVehicleInvoiceDto.setIsTakeTicket(finBillApplication.getIsLQOrigInvoice());
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
}
finBillTrailerVos = finBillTrailerVos.stream().filter(v->v.getVinNo().equals(finBillVehicleVo.getVinNo())).collect(Collectors.toList());
if (finBillTrailerVos != null) {
for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
String gcVinNo = finBillTrailerVo.getGcVinNo();
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
int counts = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getVehSid());
if (counts == 0) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid());
finVehicleInvoiceDto.setVIN(gcVinNo);
finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey());
finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue());
finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney()));
finVehicleInvoiceDto.setBillingStateKey("001");
finVehicleInvoiceDto.setBillingState("未开票");
finVehicleInvoiceDto.setTransferStateKey("001");
finVehicleInvoiceDto.setTransferState("未移交");
finVehicleInvoiceDto.setVehicleType("挂车");
finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid());
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
} else {
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
}
finVehicleInvoiceDto.setIsTakeTicket(finBillApplication.getIsLQOrigInvoice());
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
}
}
}
}
}}
/*if ("01".equals(finBillApplication.getOpenTickTypeKey())) {//判断是否为机动车销售统一发票
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid);
if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())) {//是高低开
BusValcustFilingDto busValcustFilingDto = new BusValcustFilingDto();
@ -2755,7 +2883,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
}
}
}
}*/
BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
if (oneBillMoney == null) {
busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());

Loading…
Cancel
Save