diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index bea6d6fc1c..6fc3dd5b61 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -1485,15 +1485,31 @@ public class BusDeliveredApplyService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(busDeliveredApply.getStaffUserSid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + appDeliveredDetailsVo.setPcApplyName(busDeliveredApply.getApplyName()); + appDeliveredDetailsVo.setPcApplySid(busDeliveredApply.getApplySid()); + appDeliveredDetailsVo.setPcApplyDept(busDeliveredApply.getApplyDept()); + appDeliveredDetailsVo.setPcApplyDeptSid(busDeliveredApply.getApplyDeptSid()); + appDeliveredDetailsVo.setPcStaffSid(userVoResultBean.getData().getStaffSid()); + List detailsList = busDeliveredApplyDetailsService.selectByApplySid(sid); + detailsList.removeAll(Collections.singleton(null)); if (StringUtils.isNotBlank(busDeliveredApply.getDistributorPrice())) { appDeliveredDetailsVo.setDistributorName(busDeliveredApply.getDistributorName() + ",单车中介费：" + busDeliveredApply.getDistributorPrice() + "元"); + appDeliveredDetailsVo.setPcDistributorName(busDeliveredApply.getDistributorName()); + appDeliveredDetailsVo.setPcDistributorPrice(busDeliveredApply.getDistributorPrice()); + appDeliveredDetailsVo.setPcDistributorPriceAll(new BigDecimal(busDeliveredApply.getDistributorPrice()).multiply(new BigDecimal(detailsList.size())).toString()); } if (StringUtils.isNotBlank(busDeliveredApply.getDistributorPriceTwo())) { appDeliveredDetailsVo.setDistributorNameTwo(busDeliveredApply.getDistributorNameTwo() + ",单车中介费：" + busDeliveredApply.getDistributorPriceTwo() + "元"); + appDeliveredDetailsVo.setPcDistributorNameTwo(busDeliveredApply.getDistributorNameTwo()); + appDeliveredDetailsVo.setPcDistributorPriceTwo(busDeliveredApply.getDistributorPriceTwo()); + appDeliveredDetailsVo.setPcDistributorPriceTwoAll(new BigDecimal(busDeliveredApply.getDistributorPriceTwo()).multiply(new BigDecimal(detailsList.size())).toString()); } List carList = new ArrayList<>(); - List detailsList = busDeliveredApplyDetailsService.selectByApplySid(sid); - detailsList.removeAll(Collections.singleton(null)); if (!detailsList.isEmpty()) { for (int i = 0; i < detailsList.size(); i++) { BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index 9c2a7f29ad..1abf0b4010 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -35,6 +35,7 @@ import com.yxt.anrui.base.api.basetrailer.TrailerVo; import com.yxt.anrui.base.api.basetrailer.TraliveredVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo; import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate; @@ -97,6 +98,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService list, String sid) { if (list.size() > 0) { @@ -301,6 +304,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService stringList = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData(); + busVehicleQKKPVo.setZcHgzImages(stringList); } TraliveredVo traliveredVo = baseTrailerFeign.trailerList(busVehicleQKKPVo.getVehSid(), query.getContractNo()).getData(); List trailerVos = traliveredVo.getList(); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java index be577e3824..e64af20ba7 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java @@ -25,11 +25,11 @@ *********************************************************/ package com.yxt.anrui.fin.api.fincompanyinvoicing; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -85,4 +85,11 @@ public interface FinCompanyInvoicingFeign { @GetMapping("/getDetailsByUseOrgAndSystem") @ResponseBody public ResultBean getDetailsByUseOrgAndSystem(@RequestParam("useOrgSid")String useOrgSid,@RequestParam("systemSid")String systemSid); + + @ApiOperation("根据分公司查询开票信息") + @GetMapping("/selectInvoingList") + @ResponseBody + ResultBean> selectInvoingList(@RequestParam("busSid")String busSid); + + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java index 97c06917fc..8ef72fb54b 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java @@ -79,4 +79,9 @@ public class FinCompanyInvoicingFeignFallback implements FinCompanyInvoicingFeig public ResultBean getDetailsByUseOrgAndSystem(String useOrgSid, String systemSid) { return null; } + + @Override + public ResultBean> selectInvoingList(String busSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/InvoicingVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/InvoicingVo.java new file mode 100644 index 0000000000..1e509a5b1c --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/InvoicingVo.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.fin.api.fincompanyinvoicing; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: 开票信息 + * @author: dimengzhe + * @date: 2023/5/19 + **/ +@Data +public class InvoicingVo implements Vo { + private static final long serialVersionUID = 1044076091993510821L; + + @ApiModelProperty("开票信息sid") + private String sid; + + private String dictKey; + + private String dictValue; + +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index d086987453..83cfe88151 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -458,6 +458,7 @@ public class FinBillApplicationService extends MybatisBaseService finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "车款", "1"); - List finSelectedReceivablesDetailedVos1_1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "首付款", "1"); + List finSelectedReceivablesDetailedVos1_1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "首付款及费用", "1"); //推送全款订金 List finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "订金", "1"); //贷款推送车款 @@ -1308,7 +1308,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService 1) { - int size = 0; - size = i + 1; - arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + size); + carSize = carSize + 1; + arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + carSize); } else { arReceivebill.setFBillNo(confirmation.getBillNo()); } @@ -1440,7 +1439,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService 1) { - int size = 0; - size = i + 1; - arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + size); + carSize = carSize + 1; + arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + carSize); } else { arReceivebill.setFBillNo(confirmation.getBillNo()); } @@ -1604,9 +1602,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService 1) { - int size = 0; - size = i + 1; - arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + size); + carSize = carSize + 1; + arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + carSize); } else { arReceivebill.setFBillNo(confirmation.getBillNo()); } @@ -2315,7 +2312,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "车款", "1"); - List finSelectedReceivablesDetailedVos1_1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "首付款", "1"); + List finSelectedReceivablesDetailedVos1_1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "首付款及费用", "1"); //推送全款订金 List finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "订金", "1"); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java index 3d7613747e..4116c35e68 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java @@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo; +import com.yxt.anrui.fin.api.fincompanyinvoicing.InvoicingVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -68,4 +69,6 @@ public interface FinCompanyInvoicingMapper extends BaseMapper selectInvoingList(String useOrgSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml index e3bd5b5cd7..6c23315e97 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml @@ -17,4 +17,8 @@ resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo"> select * from fin_company_invoicing where useOrgSid = #{useOrgSid} and purchaseSystemSid = #{systemSid} limit 1 + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java index fd0ef5a28d..a5348e165c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.fin.biz.fincompanyinvoicing; +import com.yxt.anrui.fin.api.fincompanyinvoicing.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -34,12 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicing; -import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingQuery; -import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingVo; -import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo; -import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDto; -import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign; /** * Project: anrui-fin(公司开票信息管理)
@@ -107,4 +102,9 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign { public ResultBean getDetailsByUseOrgAndSystem(String useOrgSid, String systemSid) { return finCompanyInvoicingService.getDetailsByUseOrgAndSystem(useOrgSid,systemSid); } + + @Override + public ResultBean> selectInvoingList(String busSid) { + return finCompanyInvoicingService.selectInvoingList(busSid); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java index 1eb92e1738..085d999d40 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java @@ -28,6 +28,8 @@ package com.yxt.anrui.fin.biz.fincompanyinvoicing; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; import com.yxt.anrui.fin.api.fincompanyinvoicing.*; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; @@ -37,9 +39,12 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; /** * Project: anrui-fin(公司开票信息管理)
@@ -59,6 +64,8 @@ public class FinCompanyInvoicingService extends MybatisBaseService createQueryWrapper(FinCompanyInvoicingQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -140,4 +147,16 @@ public class FinCompanyInvoicingService extends MybatisBaseService> selectInvoingList(String busSid) { + ResultBean> rb = ResultBean.fireFail(); + List list = new ArrayList<>(); + //查询销售订单的信息 + ResultBean resultBean = busSalesOrderFeign.getSaleOrderDetails(busSid); + if(resultBean.getData() != null){ + AppOrderDetailsVo appOrderDetailsVo = resultBean.getData(); + list = baseMapper.selectInvoingList(appOrderDetailsVo.getUseOrgSid()); + } + return rb.success().setData(list); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml index 713572b60b..4f0ef61027 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml @@ -140,10 +140,13 @@