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

Merge remote-tracking branch 'origin/master'

master
God 1 year ago
parent
2d3bb9beff ba340e3cd1
commit
f0e11d0f9e
9 changed files with 91 additions and 11 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. 10
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  2. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue
  3. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue
  4. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java
  5. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
  6. 47
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  7. 3
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.java
  8. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.xml
  9. 23
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java

10
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
View File

@ -3033,6 +3033,14 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
@Transactional(rollbackFor = Exception.class)
public ResultBean submitAppDeliveredApply(AppSubmitDeliveredApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(dto.getContractId());
if(busSalesOrder != null){
if("2".equals(busSalesOrder.getPayTypeKey())){
if(StringUtils.isBlank(dto.getLoanSid())){
return rb.setMsg("贷款的无贷款人不允许提交");
}
}
}
//判断选择的优惠是否超出
List<AppCarListVo> carList = dto.getCarList();
if (!carList.isEmpty()) {
@ -3177,7 +3185,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
variables.put("app", appMap);
//根据合同号查询销售订单
if (!"2".equals(busDeliveredApply.getPaymentMethodKey())) {
BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(busDeliveredApply.getContractNo());
busSalesOrder = busSalesOrderService.selectByContractNos(busDeliveredApply.getContractNo());
if ("2".equals(busSalesOrder.getFinancePlan())) {
//查询是否是自营非担保
ResultBean<SolutionsDetailsVo> detailsVoResultBean = loanSolutionsFeign.selectDetailsss(busSalesOrder.getSid());

2
anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue
View File

@ -59,7 +59,7 @@
<el-col :span="12">
<div class="span-sty"><span class="icon">*</span>贷款人</div>
<el-form-item prop="loanName">
<el-select v-model="formobj.loanName" class="addinputInfo" filterable placeholder="" @change="changeCustomer">
<el-select v-model="formobj.loanName" :disabled="formobj.paymentMethodKey == '2'" class="addinputInfo" filterable placeholder="" @change="changeCustomer">
<el-option v-for="item in customer_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select>
</el-form-item>

2
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue
View File

@ -58,7 +58,7 @@
<el-col :span="12">
<div class="span-sty"><span class="icon">*</span>贷款人</div>
<el-form-item prop="loanName">
<el-select v-model="formobj.loanName" class="addinputInfo" filterable placeholder="" @change="changeCustomer">
<el-select v-model="formobj.loanName" :disabled="formobj.paymentMethodKey == '2'" class="addinputInfo" filterable placeholder="" @change="changeCustomer">
<el-option v-for="item in customer_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select>
</el-form-item>

3
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java
View File

@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
@ -153,4 +154,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
LoanFinBank selectFinBnk(String contractNo);
LoanFinBank selectByBankSid(String bankSid);
BaseVehicle selectByVSid(String busVinSid);
}

6
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
View File

@ -298,4 +298,10 @@
<select id="selectByBankSid" resultType="com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank">
select * from anrui_riskcenter.loan_fin_bank where sid = #{bankSid}
</select>
<select id="selectByVSid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
select bbv.* from anrui_base.base_vehicle bbv
left join anrui_buscenter.bus_sales_order_vehicle bov on bov.linkSid = bbv.sid
where bov.sid = #{busVinSid}
</select>
</mapper>

47
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -35,6 +35,7 @@ import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
@ -1718,6 +1719,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
for (int i = 0; i < finLi.size(); i++) {
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finLi.get(i);
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
BaseVehicle baseVehicle = baseMapper.selectByVSid(finUncollectedReceivablesDetailed.getBusVinSid());
BigDecimal bigAdd = BigDecimal.ZERO;
BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectByVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
LoanSolutions loanSolutions = baseMapper.selectLoanBySid(finUncollectedReceivablesDetailed.getBusVinSid());
@ -1836,6 +1838,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getBondAmount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType());
creditResultDetailDto.setRemarks(CwSystemYT.BOND_AMOUNTS.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -1847,6 +1853,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getActualDiscount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -1858,6 +1868,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
creditResultDetailDto.setExTaxMoney("-" + loanSolutionsOtherpolicy.getOtherActualDiscount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -1869,6 +1883,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
creditResultDetailDto.setExTaxMoney("-" + loanSolutionsDetail.getProxyAccidentPremium().toString());
creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
creditResultDetailDto.setRemarks(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
}
}
@ -1947,6 +1965,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getBondAmount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType());
creditResultDetailDto.setRemarks(CwSystemYT.BOND_AMOUNTS.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -1958,6 +1980,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getActualDiscount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -1969,20 +1995,27 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
creditResultDetailDto.setExTaxMoney("-" + loanSolutionsOtherpolicy.getOtherActualDiscount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
}
}
if (loanSolutionsDetail.getProxyAccidentPremium() != null) {//意外险
if(loanSolutionsDetail.getProxyAccidentPremium().compareTo(BigDecimal.ZERO) != 0){
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanSolutionsDetail.getProxyAccidentPremium().toString());
creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
creditResultDetailDto.setRemarks(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
}
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanSolutionsDetail.getProxyAccidentPremium().toString());
creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
creditResultDetailDto.setRemarks(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getMark());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
creditResult.setResultDetails(collectionDetailDtoListOne);
creditResult.setRemarks("放款差额");

3
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
@ -33,4 +34,6 @@ public interface LoanDiffMapper extends BaseMapper<LoanDiff> {
String selectNum(String bill);
int selectByBusVnS(@Param("busVinSid") String busVinSid, @Param("realityLoan") String realityLoan);
BaseVehicle selectByVSid(String busVinSid);
}

6
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.xml
View File

@ -56,4 +56,10 @@
<update id="selectByBusVnS">
update anrui_fin.fin_uncollected_receivables_detailed set reveivableMoney = #{realityLoan} where busVinSid = #{busVinSid} and receivablesName = '融资放款'
</update>
<select id="selectByVSid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
select bbv.* from anrui_base.base_vehicle bbv
left join anrui_buscenter.bus_sales_order_vehicle bov on bov.linkSid = bbv.sid
where bov.sid = #{busVinSid}
</select>
</mapper>

23
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java
View File

@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.utils.Rule;
@ -293,8 +294,8 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
CapitalCreditResult creditResult = new CapitalCreditResult();
LoanDiffDetails loanDiffDetails = list.get(i);
String busVinSid = loanDiffDetails.getBusVinSid();
BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectByBusVinSid(busVinSid);
BaseVehicle baseVehicle = baseMapper.selectByVSid(busVinSid);
BusSalesOrder busSalesOrder = baseMapper.selectByOrderSid(busSalesOrderVehicle.getSalesOrderSid());
LoanSolutions loanSolutions = loanSolutionsService.selectByApplySid(busSalesOrder.getSid());
LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(loanSolutions.getPolicySid());
@ -343,6 +344,10 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getRealityLoanMargin().toString());
creditResultDetailDto.setUseTo(CwSystemYT.GDBZJ.getType());
creditResultDetailDto.setRemarks(CwSystemYT.GDBZJ.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -354,6 +359,10 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getRealityDiscount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -365,6 +374,10 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getRealityOtherDiscount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -376,6 +389,10 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getReceivedPremium().toString());
creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
creditResultDetailDto.setRemarks(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
}
@ -387,6 +404,10 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
creditResultDetailDto.setExTaxMoney(loanDiffDetails.getDiffPremium().toString());
creditResultDetailDto.setUseTo(CwSystemYT.YWXSR.getType());
creditResultDetailDto.setRemarks(CwSystemYT.YWXSR.getMark());
if(baseVehicle != null){
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
collectionDetailDtoListOne.add(creditResultDetailDto);
}

Write Preview
Loading…
Cancel
Save