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

修改

zhanglei
ligaode 4 weeks ago
parent
cb6e8ca3f6
commit
4756a74701
13 changed files with 153 additions and 422 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 78
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  2. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java
  3. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java
  4. 8
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeign.java
  5. 67
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeignFallback.java
  6. 37
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehFeign.java
  7. 72
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehFeignFallback.java
  8. 110
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehRest.java
  9. 13
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java
  10. 29
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehMapper.java
  11. 7
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehMapper.xml
  12. 61
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehRest.java
  13. 87
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehService.java

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

@ -99,6 +99,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFeign;
import com.yxt.anrui.riskcenter.api.loandiff.LoanDiffFeign; import com.yxt.anrui.riskcenter.api.loandiff.LoanDiffFeign;
import com.yxt.anrui.riskcenter.api.loandiff.LoanDiffsDto; import com.yxt.anrui.riskcenter.api.loandiff.LoanDiffsDto;
import com.yxt.anrui.riskcenter.api.loandiffdetails.LoanDiffDetailssDto; import com.yxt.anrui.riskcenter.api.loandiffdetails.LoanDiffDetailssDto;
@ -123,6 +124,8 @@ import com.yxt.anrui.riskcenter.api.loansettleapply.SettleFinVo;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail; import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail;
import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy; import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy;
import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDetailsVo;
import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehFeign;
import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDto; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDto;
import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateFeign; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateFeign;
import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVehDto; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVehDto;
@ -234,6 +237,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
private SysMappingFeign sysMappingFeign; private SysMappingFeign sysMappingFeign;
@Autowired @Autowired
private LoanRestoreReportApplyFeign loanRestoreReportApplyFeign; private LoanRestoreReportApplyFeign loanRestoreReportApplyFeign;
@Autowired
private LoanVehClearanceVehFeign loanVehClearanceVehFeign;
@Autowired
private LoanBeCollectionVehFeign loanBeCollectionVehFeign;
private QueryWrapper<FinCollectionConfirmation> createQueryWrapper(FinCollectionConfirmationQuery query) { private QueryWrapper<FinCollectionConfirmation> createQueryWrapper(FinCollectionConfirmationQuery query) {
// todo: 这里根据具体业务调整查询条件 // todo: 这里根据具体业务调整查询条件
@ -1488,7 +1495,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (params != null) { if (params != null) {
if (StringUtils.isNotBlank(orgPath)) { if (StringUtils.isNotBlank(orgPath)) {
useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
staffDeptSid =orgPath.substring(orgPath.lastIndexOf("/") + 1); staffDeptSid = orgPath.substring(orgPath.lastIndexOf("/") + 1);
} else { } else {
useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
} }
@ -1498,8 +1505,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (StringUtils.isNotBlank(userSid)) { if (StringUtils.isNotBlank(userSid)) {
qw.eq("furd.createBySid", userSid); qw.eq("furd.createBySid", userSid);
} }
if(StringUtils.isNotBlank(staffDeptSid)){ if (StringUtils.isNotBlank(staffDeptSid)) {
qw.eq("furd.staffDeptSid",staffDeptSid); qw.eq("furd.staffDeptSid", staffDeptSid);
} }
if (params.getSidList().size() > 0) { if (params.getSidList().size() > 0) {
qw.notIn("furd.sid", params.getSidList()); qw.notIn("furd.sid", params.getSidList());
@ -4027,8 +4034,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
paymentMoney = planDetails.getPaymentMoney(); paymentMoney = planDetails.getPaymentMoney();
} }
if (paymentMoney.compareTo(BigDecimal.ZERO) == 0) { if (paymentMoney.compareTo(BigDecimal.ZERO) == 0) {
//存在未终止的垫款申请，且不存在垫款应收 //存在未终止的垫款申请，且不存在垫款应收
int count = baseMapper.selBeVehCountByBusVinSidAndPeriod(planDetails.getBusVinSid(),planDetails.getPeriod()); int count = baseMapper.selBeVehCountByBusVinSidAndPeriod(planDetails.getBusVinSid(), planDetails.getPeriod());
if (count > 0) { if (count > 0) {
return rb.setMsg("存在未支付垫款数据，认款失败！"); return rb.setMsg("存在未支付垫款数据，认款失败！");
} }
@ -4341,6 +4348,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//与收款金额作比较：更新认款状态 1未认款/2部分认款/3已认款 //与收款金额作比较：更新认款状态 1未认款/2部分认款/3已认款
confirmation.setPaymentState(3); confirmation.setPaymentState(3);
baseMapper.updateById(confirmation); baseMapper.updateById(confirmation);
//修改控制状态
FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo = finSelectedReceivablesDetailedService.fetchKzfByCillSid(confirmation.getSid());
if (finSelectedReceivablesDetailedVo != null) {
FinUncollectedReceivablesDetailedJR finUncollectedReceivablesDetailedJR = finUncollectedReceivablesDetailedJRService.fetchBySid(finSelectedReceivablesDetailedVo.getReceivablesSid());
List<LoanVehClearanceVehDetailsVo> data = loanVehClearanceVehFeign.selByMainSid(finUncollectedReceivablesDetailedJR.getApplySid()).getData();
for (LoanVehClearanceVehDetailsVo datum : data) {
loanBeCollectionVehFeign.updateLockState(datum.getSaleVehSid(), "3", "4");
}
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdfTimes = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdfTimes = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String collectionDate = confirmation.getCollectionDate(); String collectionDate = confirmation.getCollectionDate();
@ -4382,7 +4398,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//---------------------------------------------------------- //----------------------------------------------------------
//--------------------------推送赎回款---二次销售收款 //--------------------------推送赎回款---二次销售收款
Voucher voucher = new Voucher(); Voucher voucher = new Voucher();
if(organizationVo != null){ if (organizationVo != null) {
voucher.setAccountBook(organizationVo.getOrgCode()); voucher.setAccountBook(organizationVo.getOrgCode());
voucher.setVoucherNo(organizationVo.getOrgCode()); voucher.setVoucherNo(organizationVo.getOrgCode());
} }
@ -4672,7 +4688,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
confirmation.setConfirmDate(DateUtil.today()); confirmation.setConfirmDate(DateUtil.today());
confirmation.setConfirmNameSid(userSid); confirmation.setConfirmNameSid(userSid);
baseMapper.updateById(confirmation); baseMapper.updateById(confirmation);
pushToRiskToFin(confirmation,finSelectedReceivablesDetailedVos,collectionDate,voucher); pushToRiskToFin(confirmation, finSelectedReceivablesDetailedVos, collectionDate, voucher);
//推送凭证业务 //推送凭证业务
if (!generalVoucherDetails.isEmpty()) { if (!generalVoucherDetails.isEmpty()) {
generalVoucher.setVoucherDetails(generalVoucherDetails); generalVoucher.setVoucherDetails(generalVoucherDetails);
@ -4689,12 +4705,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
collectionAfterVoucher.setVoucherDetails(collectionAfterVoucherDetails); collectionAfterVoucher.setVoucherDetails(collectionAfterVoucherDetails);
finKingDeeFeignRest.saveFeeVoucher(collectionAfterVoucher); finKingDeeFeignRest.saveFeeVoucher(collectionAfterVoucher);
} }
return rb.success().setMsg("款项确认成功"); return rb.success().setMsg("款项确认成功");
} }
private void pushToRiskToFin(FinCollectionConfirmation finalConfirmation, List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVoList, String collectionDate,Voucher voucher) { private void pushToRiskToFin(FinCollectionConfirmation finalConfirmation, List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVoList, String collectionDate, Voucher voucher) {
List<Voucher.VoucherResultDetailDto> list = new ArrayList<>(); List<Voucher.VoucherResultDetailDto> list = new ArrayList<>();
List<Voucher.VoucherResultDetailDto> list2 = new ArrayList<>(); List<Voucher.VoucherResultDetailDto> list2 = new ArrayList<>();
BigDecimal all = BigDecimal.ZERO;//赎回 BigDecimal all = BigDecimal.ZERO;//赎回
@ -4713,7 +4727,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
} }
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finalConfirmation.getCreateDeptSid()).getData(); SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finalConfirmation.getCreateDeptSid()).getData();
String customerNumber = ""; String customerNumber = "";
for (int i = 0; i <finSelectedReceivablesDetailedVoList.size() ; i++) { for (int i = 0; i < finSelectedReceivablesDetailedVoList.size(); i++) {
FinSelectedReceivablesDetailedVo v = finSelectedReceivablesDetailedVoList.get(i); FinSelectedReceivablesDetailedVo v = finSelectedReceivablesDetailedVoList.get(i);
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(v.getReceivablesSid()); FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(v.getReceivablesSid());
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(finUncollectedReceivablesDetailed.getBusVinSid()).getData(); BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(finUncollectedReceivablesDetailed.getBusVinSid()).getData();
@ -4755,10 +4769,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
customerNumber = busSalesOrderVehicle.getTemporaryNo(); customerNumber = busSalesOrderVehicle.getTemporaryNo();
} }
} }
if("9".equals(busSalesOrderVehicle.getRiskState().toString())){//赎回中-赎回凭证 if ("9".equals(busSalesOrderVehicle.getRiskState().toString())) {//赎回中-赎回凭证
////营业费用_催收费用 上门催收费用--收回车辆费用（赎回通过后推送的费用） ////营业费用_催收费用 上门催收费用--收回车辆费用（赎回通过后推送的费用）
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto();
if("收回车辆费用".equals(v.getReceivablesName())){ if ("收回车辆费用".equals(v.getReceivablesName())) {
all = all.add(new BigDecimal(v.getSubscriptionMoney())); all = all.add(new BigDecimal(v.getSubscriptionMoney()));
voucherResultDetailDtoJf2.setSummary("收款-赎回费用"); voucherResultDetailDtoJf2.setSummary("收款-赎回费用");
voucherResultDetailDtoJf2.setSubjectNo("6601.32.05"); voucherResultDetailDtoJf2.setSubjectNo("6601.32.05");
@ -4771,7 +4785,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
} }
//预提费用 待确认逾期利息 待确认途期利息--资金占用费转收入 //预提费用 待确认逾期利息 待确认途期利息--资金占用费转收入
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf3 = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoJf3 = new Voucher.VoucherResultDetailDto();
if("资金占用费".equals(v.getReceivablesName())){//借方 if ("资金占用费".equals(v.getReceivablesName())) {//借方
voucherResultDetailDtoJf3.setSummary("资金占用费转收入"); voucherResultDetailDtoJf3.setSummary("资金占用费转收入");
voucherResultDetailDtoJf3.setSubjectNo("2191.05.00"); voucherResultDetailDtoJf3.setSubjectNo("2191.05.00");
//核算部门 //核算部门
@ -4783,7 +4797,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
} }
//应收贷款车欠款_待处理欠款_扣回车辆--月还/资方逾期利息 //应收贷款车欠款_待处理欠款_扣回车辆--月还/资方逾期利息
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
if ("月还".equals(v.getReceivablesName()) || "资方逾期利息".equals(v.getReceivablesName())){ if ("月还".equals(v.getReceivablesName()) || "资方逾期利息".equals(v.getReceivablesName())) {
all = all.add(new BigDecimal(v.getSubscriptionMoney())); all = all.add(new BigDecimal(v.getSubscriptionMoney()));
voucherResultDetailDtoDf.setSummary("收款-赎回款"); voucherResultDetailDtoDf.setSummary("收款-赎回款");
voucherResultDetailDtoDf.setSubjectNo("1201.03.01"); voucherResultDetailDtoDf.setSubjectNo("1201.03.01");
@ -4797,7 +4811,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//应收贷款车欠款_到期欠款_逾期利息--资金占用费 //应收贷款车欠款_到期欠款_逾期利息--资金占用费
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto();
if("资金占用费".equals(v.getReceivablesName())){ if ("资金占用费".equals(v.getReceivablesName())) {
all = all.add(new BigDecimal(v.getSubscriptionMoney())); all = all.add(new BigDecimal(v.getSubscriptionMoney()));
voucherResultDetailDtoDf2.setSummary("收款-赎回款"); voucherResultDetailDtoDf2.setSummary("收款-赎回款");
voucherResultDetailDtoDf2.setSubjectNo("1201.02.03"); voucherResultDetailDtoDf2.setSubjectNo("1201.02.03");
@ -4810,7 +4824,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
} }
//资金占用费转收入--其他业务收入_消贷收入_消贷利息 //资金占用费转收入--其他业务收入_消贷收入_消贷利息
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf3 = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoDf3 = new Voucher.VoucherResultDetailDto();
if("资金占用费".equals(v.getReceivablesName())){//贷方 if ("资金占用费".equals(v.getReceivablesName())) {//贷方
voucherResultDetailDtoDf3.setSummary("资金占用费转收入"); voucherResultDetailDtoDf3.setSummary("资金占用费转收入");
voucherResultDetailDtoDf3.setSubjectNo("6002.01.17"); voucherResultDetailDtoDf3.setSubjectNo("6002.01.17");
//核算部门 //核算部门
@ -4820,9 +4834,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
voucherResultDetailDtoDf3.setCredit(v.getSubscriptionMoney()); voucherResultDetailDtoDf3.setCredit(v.getSubscriptionMoney());
list.add(voucherResultDetailDtoDf3); list.add(voucherResultDetailDtoDf3);
} }
}else if("10".equals(busSalesOrderVehicle.getRiskState().toString())){//二次销售中-二次销售凭证 } else if ("10".equals(busSalesOrderVehicle.getRiskState().toString())) {//二次销售中-二次销售凭证
if ("月还".equals(v.getReceivablesName()) || "资方逾期利息".equals(v.getReceivablesName())){ if ("月还".equals(v.getReceivablesName()) || "资方逾期利息".equals(v.getReceivablesName())) {
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
all2 = all2.add(new BigDecimal(v.getSubscriptionMoney())); all2 = all2.add(new BigDecimal(v.getSubscriptionMoney()));
voucherResultDetailDtoDf.setSummary("***扣回车辆再次销售款"); voucherResultDetailDtoDf.setSummary("***扣回车辆再次销售款");
@ -4835,7 +4849,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
list2.add(voucherResultDetailDtoDf); list2.add(voucherResultDetailDtoDf);
} }
if("资金占用费".equals(v.getReceivablesName())){ if ("资金占用费".equals(v.getReceivablesName())) {
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto();
all2 = all2.add(new BigDecimal(v.getSubscriptionMoney())); all2 = all2.add(new BigDecimal(v.getSubscriptionMoney()));
voucherResultDetailDtoDf2.setSummary("***扣回车辆再次销售款"); voucherResultDetailDtoDf2.setSummary("***扣回车辆再次销售款");
@ -4848,7 +4862,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
list2.add(voucherResultDetailDtoDf2); list2.add(voucherResultDetailDtoDf2);
} }
if("预计资方结清费用".equals(v.getReceivablesName())){ if ("预计资方结清费用".equals(v.getReceivablesName())) {
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf3 = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoDf3 = new Voucher.VoucherResultDetailDto();
all2 = all2.add(new BigDecimal(v.getSubscriptionMoney())); all2 = all2.add(new BigDecimal(v.getSubscriptionMoney()));
voucherResultDetailDtoDf3.setSummary("**扣回车辆再次销售-资方结清费用"); voucherResultDetailDtoDf3.setSummary("**扣回车辆再次销售-资方结清费用");
@ -4861,7 +4875,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
list2.add(voucherResultDetailDtoDf3); list2.add(voucherResultDetailDtoDf3);
} }
if("停车费".equals(v.getReceivablesName())){ if ("停车费".equals(v.getReceivablesName())) {
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto();
all2 = all2.subtract(new BigDecimal(v.getSubscriptionMoney())); all2 = all2.subtract(new BigDecimal(v.getSubscriptionMoney()));
voucherResultDetailDtoJf2.setSummary("**扣回车辆再次销售-停车费"); voucherResultDetailDtoJf2.setSummary("**扣回车辆再次销售-停车费");
@ -4873,15 +4887,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
voucherResultDetailDtoJf2.setDebit(new BigDecimal(v.getSubscriptionMoney()).negate().toString()); voucherResultDetailDtoJf2.setDebit(new BigDecimal(v.getSubscriptionMoney()).negate().toString());
list2.add(voucherResultDetailDtoJf2); list2.add(voucherResultDetailDtoJf2);
} }
if("车辆违章费用".equals(v.getReceivablesName()) || "年检费".equals(v.getReceivablesName()) || if ("车辆违章费用".equals(v.getReceivablesName()) || "年检费".equals(v.getReceivablesName()) ||
"保险费".equals(v.getReceivablesName()) || "过户费".equals(v.getReceivablesName()) "保险费".equals(v.getReceivablesName()) || "过户费".equals(v.getReceivablesName())
){ ) {
otherMoney = otherMoney.add(new BigDecimal(v.getSubscriptionMoney())); otherMoney = otherMoney.add(new BigDecimal(v.getSubscriptionMoney()));
} }
} }
} }
//客户赎回收款 //客户赎回收款
if(all.compareTo(BigDecimal.ZERO)>0){ if (all.compareTo(BigDecimal.ZERO) > 0) {
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
if (StringUtils.isNotBlank(finalConfirmation.getCollectionBankNum())) { if (StringUtils.isNotBlank(finalConfirmation.getCollectionBankNum())) {
voucherResultDetailDtoJf.setBankAccount(finalConfirmation.getCollectionBankNum()); voucherResultDetailDtoJf.setBankAccount(finalConfirmation.getCollectionBankNum());
@ -4892,7 +4906,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
list.add(voucherResultDetailDtoJf); list.add(voucherResultDetailDtoJf);
} }
if(otherMoney.compareTo(BigDecimal.ZERO)>0){ if (otherMoney.compareTo(BigDecimal.ZERO) > 0) {
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto();
all2 = all2.subtract(otherMoney); all2 = all2.subtract(otherMoney);
voucherResultDetailDtoJf2.setSummary("**扣回车辆再次销售-费用（违章、年检、保险、过户）"); voucherResultDetailDtoJf2.setSummary("**扣回车辆再次销售-费用（违章、年检、保险、过户）");
@ -4904,7 +4918,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
voucherResultDetailDtoJf2.setDebit(otherMoney.negate().toString()); voucherResultDetailDtoJf2.setDebit(otherMoney.negate().toString());
list2.add(voucherResultDetailDtoJf2); list2.add(voucherResultDetailDtoJf2);
} }
if(all2.compareTo(BigDecimal.ZERO)>0){ if (all2.compareTo(BigDecimal.ZERO) > 0) {
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto(); Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
if (StringUtils.isNotBlank(finalConfirmation.getCollectionBankNum())) { if (StringUtils.isNotBlank(finalConfirmation.getCollectionBankNum())) {
voucherResultDetailDtoJf.setBankAccount(finalConfirmation.getCollectionBankNum()); voucherResultDetailDtoJf.setBankAccount(finalConfirmation.getCollectionBankNum());
@ -4915,11 +4929,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
list2.add(voucherResultDetailDtoJf); list2.add(voucherResultDetailDtoJf);
} }
if(!list.isEmpty()){ if (!list.isEmpty()) {
voucher.setResultDetails(list); voucher.setResultDetails(list);
finKingDeeFeignRest.saveVoucher(voucher); finKingDeeFeignRest.saveVoucher(voucher);
} }
if(list2.isEmpty()){ if (list2.isEmpty()) {
voucher.setResultDetails(list2); voucher.setResultDetails(list2);
finKingDeeFeignRest.saveVoucher(voucher); finKingDeeFeignRest.saveVoucher(voucher);
} }
@ -4990,7 +5004,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//--收款-赎回款(yyyy-MM-dd) //--收款-赎回款(yyyy-MM-dd)
BigDecimal all = new BigDecimal(v.getSubscriptionMoney()); BigDecimal all = new BigDecimal(v.getSubscriptionMoney());
if (all.compareTo(BigDecimal.ZERO) != 0) { if (all.compareTo(BigDecimal.ZERO) != 0) {
voucherResultDetailDtoJf.setSummary("收款-赎回款"+"（" + collectionDate + "）"); voucherResultDetailDtoJf.setSummary("收款-赎回款" + "（" + collectionDate + "）");
voucherResultDetailDtoJf.setSubjectNo(payType); voucherResultDetailDtoJf.setSubjectNo(payType);
voucherResultDetailDtoJf.setBankAccount(finalConfirmation.getCollectionBankNum()); voucherResultDetailDtoJf.setBankAccount(finalConfirmation.getCollectionBankNum());
voucherResultDetailDtoJf.setDebit(all.toString()); voucherResultDetailDtoJf.setDebit(all.toString());
@ -5029,7 +5043,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
} }
BigDecimal allM = BigDecimal.ZERO; BigDecimal allM = BigDecimal.ZERO;
allM = all.subtract(zjzyfMoney); allM = all.subtract(zjzyfMoney);
if(allM.compareTo(BigDecimal.ZERO)>0){ if (allM.compareTo(BigDecimal.ZERO) > 0) {
voucherResultDetailDtoDf2.setSummary("收款-赎回款"); voucherResultDetailDtoDf2.setSummary("收款-赎回款");
voucherResultDetailDtoDf2.setSubjectNo("1201.03.01"); voucherResultDetailDtoDf2.setSubjectNo("1201.03.01");
//核算部门 //核算部门
@ -6222,7 +6236,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
for (AppFinSelectedReceivablesDetailedRskDto v : finSelectedReceivablesDetailedDtos) { for (AppFinSelectedReceivablesDetailedRskDto v : finSelectedReceivablesDetailedDtos) {
String loanContractNo = v.getLoanContractNo(); String loanContractNo = v.getLoanContractNo();
String vinNo = v.getVin(); String vinNo = v.getVin();
if (!v.getProjectName().equals("远程控制费")){ if (!v.getProjectName().equals("远程控制费")) {
List<AppFinUncollectedReceivablesDetailedRskVo> ruleList = finUncollectedReceivablesDetailedJRService.getRskPaymentDetailsListForRule(loanContractNo, vinNo, finCollectionConfirmation.getUseOrgSid(), finCollectionConfirmation.getPurchaseSystemSid()); List<AppFinUncollectedReceivablesDetailedRskVo> ruleList = finUncollectedReceivablesDetailedJRService.getRskPaymentDetailsListForRule(loanContractNo, vinNo, finCollectionConfirmation.getUseOrgSid(), finCollectionConfirmation.getPurchaseSystemSid());
if (!ruleList.isEmpty()) { if (!ruleList.isEmpty()) {
for (AppFinUncollectedReceivablesDetailedRskVo r : ruleList) { for (AppFinUncollectedReceivablesDetailedRskVo r : ruleList) {

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java
View File

@ -72,6 +72,8 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
@Select("select * from fin_selected_receivables_detailed where collSid = #{sid}") @Select("select * from fin_selected_receivables_detailed where collSid = #{sid}")
List<FinSelectedReceivablesDetailedVo> fetchByCillSid(String sid); List<FinSelectedReceivablesDetailedVo> fetchByCillSid(String sid);
@Select("select * from fin_selected_receivables_detailed where collSid = #{collSid} and receivablesName = '远程控制费'")
FinSelectedReceivablesDetailedVo fetchKzfByCillSid(String collSid);
/** /**
* 手机端—查询可使用款项明细列表 * 手机端—查询可使用款项明细列表

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java
View File

@ -906,4 +906,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
BigDecimal rkMoney = baseMapper.selRkByBillSid(billSid); BigDecimal rkMoney = baseMapper.selRkByBillSid(billSid);
return rb.success().setData(rkMoney); return rb.success().setData(rkMoney);
} }
public FinSelectedReceivablesDetailedVo fetchKzfByCillSid(String collSid) {
return baseMapper.fetchKzfByCillSid(collSid);
}
} }

8
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeign.java
View File

@ -37,8 +37,7 @@ import org.springframework.web.bind.annotation.*;
@FeignClient( @FeignClient(
contextId = "anrui-riskcenter-LoanBeCollectionVeh", contextId = "anrui-riskcenter-LoanBeCollectionVeh",
name = "anrui-riskcenter", name = "anrui-riskcenter",
path = "v1/loanbecollectionveh", path = "v1/loanbecollectionveh")
fallback = LoanBeCollectionVehFeignFallback.class)
public interface LoanBeCollectionVehFeign { public interface LoanBeCollectionVehFeign {
@ApiOperation("根据条件分页查询数据的列表") @ApiOperation("根据条件分页查询数据的列表")
@ -70,4 +69,9 @@ public interface LoanBeCollectionVehFeign {
@PostMapping("/saveDbr") @PostMapping("/saveDbr")
@ResponseBody @ResponseBody
public ResultBean saveDbr(@RequestBody LoanBeCollectionVehDbrDto dto); public ResultBean saveDbr(@RequestBody LoanBeCollectionVehDbrDto dto);
@ApiOperation("修改控制状态")
@GetMapping("/updateLockState")
@ResponseBody
ResultBean updateLockState(@RequestParam("saleVehSid") String saleVehSid, @RequestParam("s") String s, @RequestParam("x") String x);
} }

67
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeignFallback.java
View File

@ -1,67 +0,0 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanbecollectionveh;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
@Component
public class LoanBeCollectionVehFeignFallback implements LoanBeCollectionVehFeign {
@Override
public ResultBean<PagerVo<LoanBeCollectionVehVo>> listPage(PagerQuery<LoanBeCollectionVehQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-riskcenter/loanbecollectionveh/listPage无法访问");
}
@Override
public ResultBean save(LoanBeCollectionVehDto dto){
return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanbecollectionveh/save无法访问");
}
@Override
public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanbecollectionveh/delBySids无法访问");
}
@Override
public ResultBean<LoanBeCollectionVehDetailsVo> fetchDetailsBySid(String sid){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-riskcenter/loanbecollectionveh/fetchDetailsBySid无法访问");
}
@Override
public ResultBean<LoanBeCollectionVehDbrDetailsVo> initDbr(String saleVehSid) {
return null;
}
@Override
public ResultBean saveDbr(LoanBeCollectionVehDbrDto dto) {
return null;
}
}

37
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehFeign.java
View File

@ -35,44 +35,15 @@ import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
/**
* Project: anrui-riskcenter(车辆远程解控申请) <br/>
* File: LoanVehClearanceVehFeign.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehFeign <br/>
* Description: 车辆远程解控车辆. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-12-29 10:25:57 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "车辆远程解控车辆") @Api(tags = "车辆远程解控车辆")
@FeignClient( @FeignClient(
contextId = "anrui-riskcenter-LoanVehClearanceVeh", contextId = "anrui-riskcenter-LoanVehClearanceVeh",
name = "anrui-riskcenter", name = "anrui-riskcenter",
path = "v1/loanvehclearanceveh", path = "v1/loanvehclearanceveh")
fallback = LoanVehClearanceVehFeignFallback.class)
public interface LoanVehClearanceVehFeign { public interface LoanVehClearanceVehFeign {
@ApiOperation("根据条件分页查询数据的列表") @ApiOperation("根据申请sid获取子表")
@PostMapping("/listPage") @GetMapping("/selByMainSid/{sid}")
@ResponseBody @ResponseBody
public ResultBean<PagerVo<LoanVehClearanceVehVo>> listPage(@RequestBody PagerQuery<LoanVehClearanceVehQuery> pq); ResultBean<List<LoanVehClearanceVehDetailsVo>> selByMainSid(@PathVariable("applySid") String applySid);
@ApiOperation("新增或修改")
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody LoanVehClearanceVehDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<LoanVehClearanceVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
} }

72
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehFeignFallback.java
View File

@ -1,72 +0,0 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.riskcenter.api.loanvehclearanceveh;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: anrui-riskcenter(车辆远程解控申请) <br/>
* File: LoanVehClearanceVehFeignFallback.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehFeignFallback <br/>
* Description: 车辆远程解控车辆. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-12-29 10:25:57 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class LoanVehClearanceVehFeignFallback implements LoanVehClearanceVehFeign {
@Override
public ResultBean<PagerVo<LoanVehClearanceVehVo>> listPage(PagerQuery<LoanVehClearanceVehQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-riskcenter/loanvehclearanceveh/listPage无法访问");
}
@Override
public ResultBean save(LoanVehClearanceVehDto dto){
return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanvehclearanceveh/save无法访问");
}
@Override
public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanvehclearanceveh/delBySids无法访问");
}
@Override
public ResultBean<LoanVehClearanceVehDetailsVo> fetchDetailsBySid(String sid){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-riskcenter/loanvehclearanceveh/fetchDetailsBySid无法访问");
}
}

110
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehRest.java
View File

@ -37,74 +37,68 @@ import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
/**
* Project: anrui-riskcenter(催收措施申请) <br/>
* File: LoanBeCollectionVehFeignFallback.java <br/>
* Class: com.yxt.anrui.riskcenter.biz.loanbecollectionveh.LoanBeCollectionVehRest <br/>
* Description: 逾期催收车辆. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-12-12 16:06:20 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "逾期催收车辆") @Api(tags = "逾期催收车辆")
@RestController("com.yxt.anrui.riskcenter.biz.loanbecollectionveh.LoanBeCollectionVehRest") @RestController
@RequestMapping("v1/loanbecollectionveh") @RequestMapping("v1/loanbecollectionveh")
public class LoanBeCollectionVehRest implements LoanBeCollectionVehFeign { public class LoanBeCollectionVehRest implements LoanBeCollectionVehFeign {
@Autowired @Autowired
private LoanBeCollectionVehService loanBeCollectionVehService; private LoanBeCollectionVehService loanBeCollectionVehService;
@Override @Override
@ApiOperation("根据条件分页查询数据的列表") @ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage") @PostMapping("/listPage")
public ResultBean<PagerVo<LoanBeCollectionVehVo>> listPage(@RequestBody PagerQuery<LoanBeCollectionVehQuery> pq){ public ResultBean<PagerVo<LoanBeCollectionVehVo>> listPage(@RequestBody PagerQuery<LoanBeCollectionVehQuery> pq) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
PagerVo<LoanBeCollectionVehVo> pv = loanBeCollectionVehService.listPageVo(pq); PagerVo<LoanBeCollectionVehVo> pv = loanBeCollectionVehService.listPageVo(pq);
return rb.success().setData(pv); return rb.success().setData(pv);
} }
@Override @Override
@ApiOperation("新增或修改") @ApiOperation("新增或修改")
@PostMapping("/save") @PostMapping("/save")
public ResultBean save(@RequestBody LoanBeCollectionVehDto dto){ public ResultBean save(@RequestBody LoanBeCollectionVehDto dto) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
loanBeCollectionVehService.saveOrUpdateDto(dto); loanBeCollectionVehService.saveOrUpdateDto(dto);
return rb.success(); return rb.success();
} }
@Override @Override
@ApiOperation("根据sid批量删除") @ApiOperation("根据sid批量删除")
@PostMapping("/delBySids") @PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){ public ResultBean delBySids(@RequestBody String[] sids) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
loanBeCollectionVehService.delBySids(sids); loanBeCollectionVehService.delBySids(sids);
return rb.success(); return rb.success();
} }
@Override @Override
@ApiOperation("根据SID获取一条记录") @ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}") @GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<LoanBeCollectionVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){ public ResultBean<LoanBeCollectionVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
LoanBeCollectionVehDetailsVo vo = loanBeCollectionVehService.fetchDetailsVoBySid(sid); LoanBeCollectionVehDetailsVo vo = loanBeCollectionVehService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo); return rb.success().setData(vo);
} }
@Override @Override
public ResultBean<LoanBeCollectionVehDbrDetailsVo> initDbr(String saleVehSid) { public ResultBean<LoanBeCollectionVehDbrDetailsVo> initDbr(String saleVehSid) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
LoanBeCollectionVehDbrDetailsVo loanBeCollectionVehDbrDetailsVo = loanBeCollectionVehService.initDbr(saleVehSid); LoanBeCollectionVehDbrDetailsVo loanBeCollectionVehDbrDetailsVo = loanBeCollectionVehService.initDbr(saleVehSid);
return rb.success().setData(loanBeCollectionVehDbrDetailsVo); return rb.success().setData(loanBeCollectionVehDbrDetailsVo);
} }
@Override @Override
public ResultBean saveDbr(LoanBeCollectionVehDbrDto dto) { public ResultBean saveDbr(LoanBeCollectionVehDbrDto dto) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
loanBeCollectionVehService.saveDbr(dto); loanBeCollectionVehService.saveDbr(dto);
return rb.success(); return rb.success();
} }
@Override
public ResultBean updateLockState(String saleVehSid, String s, String x) {
ResultBean rb = ResultBean.fireFail();
loanBeCollectionVehService.updateLockState(saleVehSid, s, x);
return rb.success();
}
} }

13
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java
View File

@ -56,19 +56,6 @@ import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
/**
* Project: anrui-riskcenter(催收措施申请) <br/>
* File: LoanBeCollectionVehService.java <br/>
* Class: com.yxt.anrui.riskcenter.biz.loanbecollectionveh.LoanBeCollectionVehService <br/>
* Description: 逾期催收车辆 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-12-12 16:06:20 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service @Service
public class LoanBeCollectionVehService extends MybatisBaseService<LoanBeCollectionVehMapper, LoanBeCollectionVeh> { public class LoanBeCollectionVehService extends MybatisBaseService<LoanBeCollectionVehMapper, LoanBeCollectionVeh> {

29
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehMapper.java
View File

@ -39,35 +39,12 @@ import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehVo;
import java.util.List; import java.util.List;
/**
* Project: anrui-riskcenter(车辆远程解控申请) <br/>
* File: LoanVehClearanceVehMapper.java <br/>
* Class: com.yxt.anrui.riskcenter.biz.loanvehclearanceveh.LoanVehClearanceVehMapper <br/>
* Description: 车辆远程解控车辆. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-12-29 10:25:57 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper @Mapper
public interface LoanVehClearanceVehMapper extends BaseMapper<LoanVehClearanceVeh> { public interface LoanVehClearanceVehMapper extends BaseMapper<LoanVehClearanceVeh> {
//@Update("update loan_veh_clearance_veh set name=#{msg} where id=#{id}") @Delete("delete from loan_veh_clearance_veh where mainSid = #{dtoSid}")
//IPage<LoanVehClearanceVehVo> voPage(IPage<LoanVehClearanceVeh> page, @Param(Constants.WRAPPER) QueryWrapper<LoanVehClearanceVeh> qw);
IPage<LoanVehClearanceVehVo> selectPageVo(IPage<LoanVehClearanceVeh> page, @Param(Constants.WRAPPER) Wrapper<LoanVehClearanceVeh> qw);
List<LoanVehClearanceVehVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanVehClearanceVeh> qw);
@Select("select * from loan_veh_clearance_veh")
List<LoanVehClearanceVehVo> selectListVo();
@Delete("delete from loan_veh_clearance_veh where mainSid = #{dtoSid}")
void delByMainSid(String dtoSid); void delByMainSid(String dtoSid);
@Select("select * from loan_veh_clearance_veh where mainSid = #{sid}") @Select("select * from loan_veh_clearance_veh where mainSid = #{sid}")
List<LoanVehClearanceVehDetailsVo> selByMainSid(String sid); List<LoanVehClearanceVehDetailsVo> selByMainSid(String sid);
} }

7
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehMapper.xml
View File

@ -3,11 +3,4 @@
<mapper namespace="com.yxt.anrui.riskcenter.biz.loanvehclearanceveh.LoanVehClearanceVehMapper"> <mapper namespace="com.yxt.anrui.riskcenter.biz.loanvehclearanceveh.LoanVehClearanceVehMapper">
<!-- <where> ${ew.sqlSegment} </where>--> <!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} --> <!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehVo">
SELECT * FROM loan_veh_clearance_veh <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehVo">
SELECT * FROM loan_veh_clearance_veh <where> ${ew.sqlSegment} </where>
</select>
</mapper> </mapper>

61
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehRest.java
View File

@ -34,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVeh; import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVeh;
import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehQuery; import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehQuery;
import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehVo; import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehVo;
@ -41,60 +42,18 @@ import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDetai
import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDto; import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDto;
import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehFeign; import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehFeign;
/**
* Project: anrui-riskcenter(车辆远程解控申请) <br/>
* File: LoanVehClearanceVehFeignFallback.java <br/>
* Class: com.yxt.anrui.riskcenter.biz.loanvehclearanceveh.LoanVehClearanceVehRest <br/>
* Description: 车辆远程解控车辆. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-12-29 10:25:57 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "车辆远程解控车辆") @Api(tags = "车辆远程解控车辆")
@RestController("com.yxt.anrui.riskcenter.biz.loanvehclearanceveh.LoanVehClearanceVehRest") @RestController
@RequestMapping("v1/loanvehclearanceveh") @RequestMapping("v1/loanvehclearanceveh")
public class LoanVehClearanceVehRest implements LoanVehClearanceVehFeign { public class LoanVehClearanceVehRest implements LoanVehClearanceVehFeign {
@Autowired @Autowired
private LoanVehClearanceVehService loanVehClearanceVehService; private LoanVehClearanceVehService loanVehClearanceVehService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<LoanVehClearanceVehVo>> listPage(@RequestBody PagerQuery<LoanVehClearanceVehQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<LoanVehClearanceVehVo> pv = loanVehClearanceVehService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody LoanVehClearanceVehDto dto){
ResultBean rb = ResultBean.fireFail();
loanVehClearanceVehService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
loanVehClearanceVehService.delBySids(sids);
return rb.success();
}
@Override @Override
@ApiOperation("根据SID获取一条记录") public ResultBean<List<LoanVehClearanceVehDetailsVo>> selByMainSid(String applySid) {
@GetMapping("/fetchDetailsBySid/{sid}") ResultBean rb = ResultBean.fireFail();
public ResultBean<LoanVehClearanceVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){ List<LoanVehClearanceVehDetailsVo> loanVehClearanceVehDetailsVos = loanVehClearanceVehService.selByMainSid(applySid);
ResultBean rb = ResultBean.fireFail(); return rb.success().setData(loanVehClearanceVehDetailsVos);
LoanVehClearanceVehDetailsVo vo = loanVehClearanceVehService.fetchDetailsVoBySid(sid); }
return rb.success().setData(vo);
}
} }

87
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehService.java
View File

@ -45,74 +45,39 @@ import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
/**
* Project: anrui-riskcenter(车辆远程解控申请) <br/>
* File: LoanVehClearanceVehService.java <br/>
* Class: com.yxt.anrui.riskcenter.biz.loanvehclearanceveh.LoanVehClearanceVehService <br/>
* Description: 车辆远程解控车辆 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-12-29 10:25:57 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service @Service
public class LoanVehClearanceVehService extends MybatisBaseService<LoanVehClearanceVehMapper, LoanVehClearanceVeh> { public class LoanVehClearanceVehService extends MybatisBaseService<LoanVehClearanceVehMapper, LoanVehClearanceVeh> {
private QueryWrapper<LoanVehClearanceVeh> createQueryWrapper(LoanVehClearanceVehQuery query) {
// todo: 这里根据具体业务调整查询条件 public void saveOrUpdateDto(LoanVehClearanceVehDto dto) {
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<LoanVehClearanceVeh> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<LoanVehClearanceVehVo> listPageVo(PagerQuery<LoanVehClearanceVehQuery> pq) {
LoanVehClearanceVehQuery query = pq.getParams();
QueryWrapper<LoanVehClearanceVeh> qw = createQueryWrapper(query);
IPage<LoanVehClearanceVeh> page = PagerUtil.queryToPage(pq);
IPage<LoanVehClearanceVehVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<LoanVehClearanceVehVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(LoanVehClearanceVehDto dto){
String dtoSid = dto.getSid(); String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) { if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto); this.insertByDto(dto);
return; return;
} }
this.updateByDto(dto); this.updateByDto(dto);
} }
public void insertByDto(LoanVehClearanceVehDto dto){ public void insertByDto(LoanVehClearanceVehDto dto) {
LoanVehClearanceVeh entity = new LoanVehClearanceVeh(); LoanVehClearanceVeh entity = new LoanVehClearanceVeh();
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity); baseMapper.insert(entity);
} }
public void updateByDto(LoanVehClearanceVehDto dto){ public void updateByDto(LoanVehClearanceVehDto dto) {
String dtoSid = dto.getSid(); String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) { if (StringUtils.isBlank(dtoSid)) {
return; return;
} }
LoanVehClearanceVeh entity = fetchBySid(dtoSid); LoanVehClearanceVeh entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity); baseMapper.updateById(entity);
} }
public LoanVehClearanceVehDetailsVo fetchDetailsVoBySid(String sid){
LoanVehClearanceVeh entity = fetchBySid(sid);
LoanVehClearanceVehDetailsVo vo = new LoanVehClearanceVehDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public void delByMainSid(String dtoSid) { public void delByMainSid(String dtoSid) {
baseMapper.delByMainSid(dtoSid); baseMapper.delByMainSid(dtoSid);
} }
public List<LoanVehClearanceVehDetailsVo> selByMainSid(String sid) { public List<LoanVehClearanceVehDetailsVo> selByMainSid(String sid) {
return baseMapper.selByMainSid(sid); return baseMapper.selByMainSid(sid);
} }
} }
Write Preview
Loading…
Cancel
Save