yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化

master
dimengzhe 2 years ago
parent
5ff70f4ec1
commit
4558ee408b
8 changed files with 48 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/LoanOtherReceivablePush.java
  2. 79
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
  3. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
  4. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
  5. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
  6. 1
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java
  7. 1
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java
  8. 1
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java

1
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/LoanOtherReceivablePush.java
View File

@ -14,5 +14,4 @@ public class LoanOtherReceivablePush {
private String borrowerSid;
@ApiModelProperty("销售订单sid")
private String saleOrderSid;
private String loanContractSid;
}

79
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
View File

@ -291,49 +291,54 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
BusSalesOrderLoancontract busSalesOrderLoancontract = fetchBySid(loanContractSid);
if (busSalesOrderLoancontract != null) {
//根据销售订单的贷款人sid查询车辆表中的数据
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByBorrowSid2(busSalesOrderLoancontract.getBorrowerSid(),loanContractSid);
List<BusSalesOrderVehicle> busSalesOrderVehicleList = busSalesOrderVehicleService.selectByBorrowSid2(busSalesOrderLoancontract.getBorrowerSid(),saleOrderSid);
//这是生成业务系统融资放款应收的逻辑：
// 融资放款=融资项目总额-融资首付-[贷款保证金]-[厂家贴息]，根据选择的产品政策来判断，若贷款保证金为固定的，需要减去，若为敞口的，不需要减；差额放款需要减厂家贴息，全额放款不需要。差额放款的厂家贴息金额存入“其他应收”字段中，
//计算融资放款的金额以及厂家贴息金额
ResultBean<PushVo> resultBean = loanSolutionsFeign.selectMoney(saleOrderSid);
if (resultBean.getData() != null) {
PushVo pushVo = resultBean.getData();
UnCollectionDto unCollectionDto = new UnCollectionDto();
unCollectionDto.setContractNo(busSalesOrder.getContractNo());
// unCollectionDto.setContractSid(contractSid);
//客户名称
unCollectionDto.setCustomerName(busSalesOrder.getCustomerName());
//客户sid
unCollectionDto.setCustomerSid(busSalesOrder.getCustomerSid());
//客户类型
unCollectionDto.setCustomerClass(busSalesOrder.getCustomerClass());
//客户类型
unCollectionDto.setCustomerClassKey(busSalesOrder.getCustomerClassKey());
//客户头像
unCollectionDto.setCustomerImage(busSalesOrder.getCustomerPhoto());
unCollectionDto.setReceivablesName("融资放款");
unCollectionDto.setCustomerPhone(busSalesOrder.getMobile());
unCollectionDto.setUseOrgSid(busSalesOrder.getUseOrgSid());
unCollectionDto.setVinNo(busSalesOrderVehicle.getLinkNo());
unCollectionDto.setCurrentReceivableMoney(pushVo.getMoney());
unCollectionDto.setUserSid(busSalesOrder.getCreateBySid());
unCollectionDto.setReveivableMoney(pushVo.getMoney());
unCollectionDto.setBusVinSid(busSalesOrderVehicle.getSid());
unCollectionDto.setPayType(busSalesOrder.getPayType());
unCollectionDto.setPayTypeKey(busSalesOrder.getPayTypeKey());
unCollectionDto.setPurchaseSystemName(busSalesOrder.getPurchaseSystemName());
unCollectionDto.setPurchaseSystemSid(busSalesOrder.getPurchaseSystemSid());
unCollectionDto.setOrgSidPath(busSalesOrder.getOrgSidPath());
unCollectionDto.setStaffUserSid(busSalesOrder.getCreateBySid());
unCollectionDto.setStaffName(busSalesOrder.getStaffName());
unCollectionDto.setStaffDeptName(busSalesOrder.getOrgName());
unCollectionDto.setStaffDeptSid(busSalesOrder.getOrgSid());
unCollectionDto.setUseOrgName(busSalesOrder.getUseOrgName());
unCollectionDto.setKxState("01");
if (StringUtils.isNotBlank(pushVo.getOtherReceivableMoney())) {
unCollectionDto.setOtherReceivableMoney(new BigDecimal(pushVo.getOtherReceivableMoney()));
busSalesOrderVehicleList.removeAll(Collections.singleton(null));
if(!busSalesOrderVehicleList.isEmpty()){
for (int i = 0; i < busSalesOrderVehicleList.size(); i++) {
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleList.get(i);
UnCollectionDto unCollectionDto = new UnCollectionDto();
unCollectionDto.setContractNo(busSalesOrder.getContractNo());
//客户名称
unCollectionDto.setCustomerName(busSalesOrder.getCustomerName());
//客户sid
unCollectionDto.setCustomerSid(busSalesOrder.getCustomerSid());
//客户类型
unCollectionDto.setCustomerClass(busSalesOrder.getCustomerClass());
//客户类型
unCollectionDto.setCustomerClassKey(busSalesOrder.getCustomerClassKey());
//客户头像
unCollectionDto.setCustomerImage(busSalesOrder.getCustomerPhoto());
unCollectionDto.setReceivablesName("融资放款");
unCollectionDto.setCustomerPhone(busSalesOrder.getMobile());
unCollectionDto.setUseOrgSid(busSalesOrder.getUseOrgSid());
unCollectionDto.setVinNo(busSalesOrderVehicle.getLinkNo());
unCollectionDto.setCurrentReceivableMoney(pushVo.getMoney());
unCollectionDto.setUserSid(busSalesOrder.getCreateBySid());
unCollectionDto.setReveivableMoney(pushVo.getMoney());
unCollectionDto.setBusVinSid(busSalesOrderVehicle.getSid());
unCollectionDto.setPayType(busSalesOrder.getPayType());
unCollectionDto.setPayTypeKey(busSalesOrder.getPayTypeKey());
unCollectionDto.setPurchaseSystemName(busSalesOrder.getPurchaseSystemName());
unCollectionDto.setPurchaseSystemSid(busSalesOrder.getPurchaseSystemSid());
unCollectionDto.setOrgSidPath(busSalesOrder.getOrgSidPath());
unCollectionDto.setStaffUserSid(busSalesOrder.getCreateBySid());
unCollectionDto.setStaffName(busSalesOrder.getStaffName());
unCollectionDto.setStaffDeptName(busSalesOrder.getOrgName());
unCollectionDto.setStaffDeptSid(busSalesOrder.getOrgSid());
unCollectionDto.setUseOrgName(busSalesOrder.getUseOrgName());
unCollectionDto.setKxState("01");
if (StringUtils.isNotBlank(pushVo.getOtherReceivableMoney())) {
unCollectionDto.setOtherReceivableMoney(new BigDecimal(pushVo.getOtherReceivableMoney()));
}
finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
}
}
finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
}
}
return rb.success();
@ -352,7 +357,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
//-----------获取其他应收单对象----------------
CapitalCreditResult creditResult = new CapitalCreditResult();
//根据销售订单的贷款人sid查询车辆表中的数据
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByBorrowSid2(borrowerDetailsVo.getSid(),loanOtherReceivablePush.getLoanContractSid());
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByBorrowSid(borrowerDetailsVo.getSid());
if (null != busSalesOrderVehicle) {
String customerNumber = "";
//判断财务系统是否有客户

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
View File

@ -154,7 +154,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
List<BusBorrowVehicleVo> selectListByOrdersSid2(String saleOrderSid);
BusSalesOrderVehicle selectByBorrowSid(String sid);
BusSalesOrderVehicle selectByBorrowSid2(@Param("sid") String sid,@Param("loanContractSid") String loanContractSid);
List<BusSalesOrderVehicle> selectByBorrowSid2(@Param("sid") String sid,@Param("orderSid") String orderSid);
@Select("select * from bus_sales_order_vehicle where linkSid = #{vehSid} and salesOrderSid = #{sid}")
BusSalesOrderVehicle selectByOrderSidAndVehSid(@Param("sid") String sid,@Param("vehSid") String vehSid);

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
View File

@ -291,7 +291,7 @@
</select>
<select id="selectByBorrowSid2" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
select * from bus_sales_order_vehicle where borrowerSid = #{sid} and loanContractSid = #{loanContractSid}
select * from bus_sales_order_vehicle where borrowerSid = #{sid} and salesOrderSid = #{orderSid}
</select>
<select id="saleOrderInputLenderVins"

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
View File

@ -598,8 +598,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
return baseMapper.selectByBorrowSid(sid);
}
public BusSalesOrderVehicle selectByBorrowSid2(String sid,String loanContractSid) {
return baseMapper.selectByBorrowSid2(sid,loanContractSid);
public List<BusSalesOrderVehicle> selectByBorrowSid2(String sid,String saleOrderSid) {
return baseMapper.selectByBorrowSid2(sid,saleOrderSid);
}
public ResultBean<BusSalesOrderVehicle> selectByOrderSidAndVehSid(String sid, String vehSid) {

1
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/dailyreport/DailyReportFeign.java
View File

@ -4,6 +4,7 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.ResponseBody;

1
anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportService.java
View File

@ -9,6 +9,7 @@ import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
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;

1
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java
View File

@ -217,7 +217,6 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
loanContractPush.setSaleOrderSid(loanCapitalCreditResult.getSaleOrderSid());
BusSalesOrderLoancontractDetailsVo loancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(loanCapitalCreditResult.getLoanContractSid()).getData();
loanOtherReceivablePush.setSaleOrderSid(loanCapitalCreditResult.getSaleOrderSid());
loanOtherReceivablePush.setLoanContractSid(loanCapitalCreditResult.getLoanContractSid());
String borrowerSid = "";
if (loancontractDetailsVo != null) {
loanOtherReceivablePush.setBorrowerSid(loancontractDetailsVo.getBorrowerSid());

Write Preview
Loading…
Cancel
Save