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

优化

master
dimengzhe 2 years ago
parent
0fe6521ea5
commit
6a127db3af
1 changed files with 52 additions and 91 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. 143
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java

143
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java
View File

@ -42,6 +42,7 @@ import com.yxt.anrui.buscenter.api.busdelivereddetailsdiscount.BusDeliveredDetai
import com.yxt.anrui.buscenter.api.busdelivereddetailsdiscount.BusDeliveredDetailsDiscountsVo;
import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessage;
import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessagesVo;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo;
@ -191,40 +192,6 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
}
IPage<BusDelivered> page = PagerUtil.queryToPage(pq);
IPage<BusDeliveredVo> pagging = baseMapper.selectListsVoNew(page, qw);
List<BusDeliveredVo> list = pagging.getRecords();
list.removeAll(Collections.singleton(null));
if(!list.isEmpty()){
for (int i = 0; i < list.size(); i++) {
BusDeliveredVo busDeliveredVo = list.get(i);
String busVinSid = busDeliveredVo.getBusVinSid();
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busVinSid);
if(busSalesOrderVehicle != null){
String saleOrderSid = busSalesOrderVehicle.getSalesOrderSid();
String loanContractSid = busSalesOrderVehicle.getLoanContractSid();
//根据消贷合同和销售订单查询
ResultBean<LoanFileexamine> loanFileexamineResultBean = loanFileexamineFeign.selectOrderSidAndContract(saleOrderSid,loanContractSid);
if(!loanFileexamineResultBean.getSuccess()){
busDeliveredVo.setBankStateValue("未审核");
busDeliveredVo.setZlStateValue("否");
}else{
LoanFileexamine loanFileexamine = loanFileexamineResultBean.getData();
if("1".equals(loanFileexamine.getZlState())){
busDeliveredVo.setZlStateValue("是");
busDeliveredVo.setZlState(loanFileexamine.getZlState());
}else{
busDeliveredVo.setZlStateValue("否");
busDeliveredVo.setZlState(loanFileexamine.getZlState());
}
if(StringUtils.isBlank(loanFileexamine.getBankStateValue())){
busDeliveredVo.setBankStateValue("未审核");
}else{
busDeliveredVo.setBankStateValue(loanFileexamine.getBankStateValue());
busDeliveredVo.setBankStateKey(loanFileexamine.getBankStateKey());
}
}
}
}
}
PagerVo<BusDeliveredVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
@ -314,44 +281,6 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
qw.eq("bo.createBySid", pq.getParams().getUserSid());
}
IPage<AppBusDeliveredPageVo> iPage = baseMapper.getRetrievalNotListNew(page, qw, name);
List<AppBusDeliveredPageVo> list = iPage.getRecords();
list.removeAll(Collections.singleton(null));
if(!list.isEmpty()){
for (int i = 0; i < list.size(); i++) {
AppBusDeliveredPageVo busDeliveredVos = list.get(i);
List<AppVinListVo> vinList = busDeliveredVos.getVinList();
for (int j = 0; j < vinList.size(); j++) {
AppVinListVo appVinListVo = vinList.get(j);
String busVinSid = appVinListVo.getBusVinSid();
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busVinSid);
if(busSalesOrderVehicle != null){
String saleOrderSid = busSalesOrderVehicle.getSalesOrderSid();
String loanContractSid = busSalesOrderVehicle.getLoanContractSid();
//根据消贷合同和销售订单查询
ResultBean<LoanFileexamine> loanFileexamineResultBean = loanFileexamineFeign.selectOrderSidAndContract(saleOrderSid,loanContractSid);
if(!loanFileexamineResultBean.getSuccess()){
appVinListVo.setBankStateValue("未审核");
appVinListVo.setZlStateValue("否");
}else{
LoanFileexamine loanFileexamine = loanFileexamineResultBean.getData();
if("1".equals(loanFileexamine.getZlState())){
appVinListVo.setZlStateValue("是");
appVinListVo.setZlState(loanFileexamine.getZlState());
}else{
appVinListVo.setZlStateValue("否");
appVinListVo.setZlState(loanFileexamine.getZlState());
}
if(StringUtils.isBlank(loanFileexamine.getBankStateValue())){
appVinListVo.setBankStateValue("未审核");
}else{
appVinListVo.setBankStateValue(loanFileexamine.getBankStateValue());
appVinListVo.setBankStateKey(loanFileexamine.getBankStateKey());
}
}
}
}
}
}
return iPage;
}
@ -515,30 +444,34 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
deliveredUseMessagesVo.setVin(busSalesOrderVehicle.getLinkNo().substring(busSalesOrderVehicle.getLinkNo().length() - 8));
appCarListVo.setRealBuyer(deliveredUseMessagesVo);
//===============================添加资料是否齐全和资方放款是否审核
String saleOrderSid = busSalesOrderVehicle.getSalesOrderSid();
String loanContractSid = busSalesOrderVehicle.getLoanContractSid();
//根据消贷合同和销售订单查询
ResultBean<LoanFileexamine> loanFileexamineResultBean = loanFileexamineFeign.selectOrderSidAndContract(saleOrderSid,loanContractSid);
if(!loanFileexamineResultBean.getSuccess()){
appCarListVo.setBankStateValue("未审核");
appCarListVo.setZlStateValue("否");
}else{
LoanFileexamine loanFileexamine = loanFileexamineResultBean.getData();
if("1".equals(loanFileexamine.getZlState())){
appCarListVo.setZlStateValue("是");
appCarListVo.setZlState(loanFileexamine.getZlState());
}else{
appCarListVo.setZlStateValue("否");
appCarListVo.setZlState(loanFileexamine.getZlState());
}
if(StringUtils.isBlank(loanFileexamine.getBankStateValue())){
BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(busSalesOrderVehicle.getSalesOrderSid());
if(busSalesOrder != null && "2".equals(busSalesOrder.getPayTypeKey())){
String saleOrderSid = busSalesOrderVehicle.getSalesOrderSid();
String loanContractSid = busSalesOrderVehicle.getLoanContractSid();
//根据消贷合同和销售订单查询
ResultBean<LoanFileexamine> loanFileexamineResultBean = loanFileexamineFeign.selectOrderSidAndContract(saleOrderSid,loanContractSid);
if(!loanFileexamineResultBean.getSuccess()){
appCarListVo.setBankStateValue("未审核");
appCarListVo.setZlStateValue("否");
}else{
appCarListVo.setBankStateValue(loanFileexamine.getBankStateValue());
appCarListVo.setBankStateKey(loanFileexamine.getBankStateKey());
LoanFileexamine loanFileexamine = loanFileexamineResultBean.getData();
if("1".equals(loanFileexamine.getZlState())){
appCarListVo.setZlStateValue("是");
appCarListVo.setZlState(loanFileexamine.getZlState());
}else{
appCarListVo.setZlStateValue("否");
appCarListVo.setZlState(loanFileexamine.getZlState());
}
if(StringUtils.isBlank(loanFileexamine.getBankStateValue())){
appCarListVo.setBankStateValue("未审核");
}else{
appCarListVo.setBankStateValue(loanFileexamine.getBankStateValue());
appCarListVo.setBankStateKey(loanFileexamine.getBankStateKey());
}
}
}
carList.add(appCarListVo);
}
@ -854,6 +787,34 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
BusDeliveredUseMessagesVo deliveredUseMessagesVo = new BusDeliveredUseMessagesVo();
deliveredUseMessagesVo.setVin(busSalesOrderVehicle.getLinkNo().substring(busSalesOrderVehicle.getLinkNo().length() - 8));
appCarListVo.setRealBuyer(deliveredUseMessagesVo);
BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(busSalesOrderVehicle.getSalesOrderSid());
if(busSalesOrder != null && "2".equals(busSalesOrder.getPayTypeKey())){
//===============================添加资料是否齐全和资方放款是否审核
String saleOrderSid = busSalesOrderVehicle.getSalesOrderSid();
String loanContractSid = busSalesOrderVehicle.getLoanContractSid();
//根据消贷合同和销售订单查询
ResultBean<LoanFileexamine> loanFileexamineResultBean = loanFileexamineFeign.selectOrderSidAndContract(saleOrderSid,loanContractSid);
if(!loanFileexamineResultBean.getSuccess()){
appCarListVo.setBankStateValue("未审核");
appCarListVo.setZlStateValue("否");
}else{
LoanFileexamine loanFileexamine = loanFileexamineResultBean.getData();
if("1".equals(loanFileexamine.getZlState())){
appCarListVo.setZlStateValue("是");
appCarListVo.setZlState(loanFileexamine.getZlState());
}else{
appCarListVo.setZlStateValue("否");
appCarListVo.setZlState(loanFileexamine.getZlState());
}
if(StringUtils.isBlank(loanFileexamine.getBankStateValue())){
appCarListVo.setBankStateValue("未审核");
}else{
appCarListVo.setBankStateValue(loanFileexamine.getBankStateValue());
appCarListVo.setBankStateKey(loanFileexamine.getBankStateKey());
}
}
}
list.add(appCarListVo);
}
return rb.success().setData(list);

Write Preview
Loading…
Cancel
Save