Browse Source

优化

master
God 2 years ago
parent
commit
3db9e039d4
  1. 214
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseQuotationVo.java
  2. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java
  3. 76
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
  4. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java
  5. 9
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java
  6. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java
  7. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
  8. 11
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java
  9. 40
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
  10. 10
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  11. 1
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

214
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseQuotationVo.java

@ -13,98 +13,144 @@ import lombok.Data;
public class BaseQuotationVo implements Vo {
@ApiModelProperty("销售部门")
private String sid;
private String saleDeptName;
@ApiModelProperty("销售专员")
private String vinSid;
private String staffName;
@ApiModelProperty("贷款合同编号")
private String vinNo;
private String loanContractNo;
@ApiModelProperty("贷款人姓名")
private String modelConfig;
private String loanBorrName;
@ApiModelProperty("车架号")
private String type;
private String vinNo;
@ApiModelProperty("电话")
private String saleDate;
private String mobile;
@ApiModelProperty("地址")
private String price;
private String address;
@ApiModelProperty("挂靠公司")
private String orgName;
private String affiliatedCompany;
@ApiModelProperty("车型")
private String staffName;
private String modelName;
@ApiModelProperty("数量")
private int num = 1;
@ApiModelProperty("是否为终端客户")
private String isTerminal;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("手机号码")
private String mobile;
@ApiModelProperty("赠品说明")
private String giftsDescription;
@ApiModelProperty("销售折让")
private String salesAllowance;
@ApiModelProperty("中介人1")
private String middleOne;
@ApiModelProperty("返利金额1")
private String rebateMoneyOne;
@ApiModelProperty("中介人2")
private String middleTwo;
@ApiModelProperty("返利金额2")
private String rebateMoneyTwo;
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("车型简称")
private String modelName; // 车型简称
@ApiModelProperty("车型sid")
private String modelSid; // 车型sid
@ApiModelProperty("内部编码")
private String insideCode; // 内部编码
@ApiModelProperty("配置sid")
private String modelConfigSid; // 配置sid
@ApiModelProperty("车型与配置关联sid")
private String vehModelConfigSid; // 车型与配置关联sid
@ApiModelProperty("销售指导价")
private String guidedPrice; // 销售指导价
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("上装/挂车名称")
private String trailerOrInstallName;
@ApiModelProperty("上装/挂车成交价")
private String trailerOrInstallDealPrice;
@ApiModelProperty("上装/挂车物料编码")
private String trailerOrInstallCode;
@ApiModelProperty("内部引荐人姓名")
private String innerName;
@ApiModelProperty("采购类型value")
private String manPurOrderTypeValue;
@ApiModelProperty("挂车1车型")
private String gcOneModel;
@ApiModelProperty("挂车1采购单位")
private String gcOnePurUnit;
@ApiModelProperty("挂车2车型")
private String gcTwoModel;
@ApiModelProperty("挂车2采购单位")
private String gcTwoPurUnit;
@ApiModelProperty("上装1名称")
private String szOneName;
@ApiModelProperty("上装1采购单位")
private String szOnePurUnit;
@ApiModelProperty("上装2名称")
private String szTwoName;
@ApiModelProperty("上装2采购单位")
private String szTwoPurUnit;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("是否打包")
private String isPack;
@ApiModelProperty("产品政策")
private String policyName;
@ApiModelProperty("融资项目")
private String financProject;
@ApiModelProperty("融资项目总额")
private String loanTotal;
@ApiModelProperty("首付比例")
private String downPayRatio;
@ApiModelProperty("首付金额")
private String downPayAmount;
@ApiModelProperty("产品贷款金额")
private String loanAmount;
@ApiModelProperty("产品期数")
private String loanPeriod;
@ApiModelProperty("贷款保证金比例")
private String bondRatio;
@ApiModelProperty("贷款保证金")
private String bondAmount;
@ApiModelProperty("厂家贴息")
private String factoryDiscount;
@ApiModelProperty("贴息用途")
private String factoryDiscountUse;
@ApiModelProperty("年利率(%)")
private String policyYearRatio;
@ApiModelProperty("月还金额")
private String loanPayMoney;
@ApiModelProperty("利息总额")
private String loanInterest;
@ApiModelProperty("贴息抵车款")
private String discountCar;
@ApiModelProperty("其它融名称")
private String otherPolicyName;
@ApiModelProperty("贷款金额")
private String loanAmountTotal;
@ApiModelProperty("期数")
private String period;
@ApiModelProperty("年利率(%)")
private String otherPolicyYearRatio;
@ApiModelProperty("月还金额")
private String monthlyRepay;
@ApiModelProperty("利息总额")
private String interest;
@ApiModelProperty("融资首付")
private String loanDownPay;
@ApiModelProperty("实际首付比例")
private String downPayAmountsRatio;
@ApiModelProperty("总贷款金额")
private String hzLoanAmountTotal;
@ApiModelProperty("期数")
private String hzPeriod;
@ApiModelProperty("月还金额")
private String hzMonthlyRepay;
@ApiModelProperty("利息总额")
private String hzInterest;
@ApiModelProperty("预计首期还款日")
private String returnTime;
@ApiModelProperty("融资首付")
private String mxLoanDownPay;
@ApiModelProperty("贷款保证金")
private String mxBondAmount;
@ApiModelProperty("保险保证金")
private String depositPremium;
@ApiModelProperty("落户保证金")
private String depositSettle;
@ApiModelProperty("服务费")
private String serviceAmount;
@ApiModelProperty("代收意外险")
private String proxyAccidentPremium;
@ApiModelProperty("上牌费")
private String licenseFfe;
@ApiModelProperty("运管费")
private String operationAmount;
@ApiModelProperty("补车价")
private String vehOtherPrice;
@ApiModelProperty("其它费用")
private String otherAmount;
@ApiModelProperty("其它费用说明")
private String otherAmountRemark;
@ApiModelProperty("办理方式选择")
private String dealWay;
@ApiModelProperty("代收费用合计")
private String proxyTotal;
@ApiModelProperty("代收首年保险费")
private String proxyPremium;
@ApiModelProperty("代收购置税")
private String proxyPurchasetax;
@ApiModelProperty("应收合计")
private String receivableTotal;
@ApiModelProperty("抵顶费用合计")
private String offsetTotal;
@ApiModelProperty("抵顶首年保险费")
private String offsetPremium;
@ApiModelProperty("抵顶购置税")
private String offsetPurchasetax;
@ApiModelProperty("实收合计")
private String realTotal;
@ApiModelProperty("车辆总价")
private String vehTotalPrice;
@ApiModelProperty("名义(留购)价")
private String nominalPrice;
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java

@ -137,6 +137,6 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign {
@Override
public ResultBean<BaseQuotationVo> selectQuotation(String sid) {
return null;
return baseVehicleOutService.selectQuotation(sid);
}
}

76
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@ -38,8 +38,17 @@ import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderSourceLCVo;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign;
import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelFeign;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
@ -120,6 +129,14 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
private LoanSolutionsFeign loanSolutionsFeign;
@Autowired
private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
@Autowired
private BusSalesOrderLoancontractFeign busSalesOrderLoancontractFeign;
@Autowired
private BusSalesOrderBorrowerFeign busSalesOrderBorrowerFeign;
@Autowired
private CrmCustomerTempFeign crmCustomerTempFeign;
@Autowired
private BusSalesOrderModelFeign busSalesOrderModelFeign;
public ResultBean<Boolean> vehicleOut(BaseVehicleOutDto dto) {
log.info("BaseVehicleOutService-vehicleOut-95:{}", JSONObject.toJSONString(dto));
@ -2243,4 +2260,63 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
BaseSalesReturnVo vo = baseMapper.selectByVehReturn(vinSid, contractNo);
return rb.success().setData(vo);
}
public ResultBean<BaseQuotationVo> selectQuotation(String sid) {
ResultBean rb = ResultBean.fireFail();
BaseQuotationVo baseQuotationVo = new BaseQuotationVo();
//查询出库子表
BaseVehicleOut baseVehicleOut = fetchBySid(sid);
//查询出库主表
BaseVehicleOutApply baseVehicleOutApply = baseVehicleOutApplyService.fetchBySid(baseVehicleOut.getMainSid());
//根据合同号和车辆sid查询销售订单车辆信息
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(baseVehicleOutApply.getContractNo(), baseVehicleOut.getVinSid()).getData();
//查询销售订单信息
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(busSalesOrderVehicle.getSalesOrderSid()).getData();
//销售部门
baseQuotationVo.setSaleDeptName(busSalesOrder.getOrgName());
//销售人员
baseQuotationVo.setStaffName(busSalesOrder.getStaffName());
//销售消贷合同信息
BusSalesOrderLoancontractDetailsVo busSalesOrderLoancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(busSalesOrderVehicle.getLoanContractSid()).getData();
//贷款合同编号
baseQuotationVo.setLoanContractNo(busSalesOrderLoancontractDetailsVo.getLoanContractNo());
//贷款人姓名
baseQuotationVo.setLoanBorrName(busSalesOrderLoancontractDetailsVo.getBorrowerName());
//车架号
baseQuotationVo.setVinNo(baseVehicleOut.getVinNo());
//查询贷款人信息
BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderLoancontractDetailsVo.getBorrowerSid()).getData();
//电话
baseQuotationVo.setMobile(busSalesOrderBorrowerDetailsVo.getMobile());
//查询客户信息
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busSalesOrderBorrowerDetailsVo.getCustomSid()).getData();
//地址
baseQuotationVo.setAddress(crmCustomerTempVo.getAddress());
//挂靠公司名称
baseQuotationVo.setAffiliatedCompany(busSalesOrder.getAffiliatedCompany());
//查询销售订单车型信息
BusSalesOrderModel busSalesOrderModel = busSalesOrderModelFeign.fetchByOrderSid(busSalesOrder.getSid()).getData();
//车型
baseQuotationVo.setModelName(busSalesOrderModel.getModelName());
//查询挂车信息
List<BaseTrailerVo> baseTrailerVos = baseTrailerService.fetchAllByVehSid(baseVehicleOut.getVinSid());
if (baseTrailerVos.size() == 1){
BaseTrailerVo baseTrailerVo = baseTrailerVos.get(0);
//挂车车型
baseQuotationVo.setGcOneModel(baseTrailerVo.getTrailerModel());
//采购单位 TODO
}else if (baseTrailerVos.size() > 1){
BaseTrailerVo baseTrailerVo1 = baseTrailerVos.get(0);
//挂车车型
baseQuotationVo.setGcOneModel(baseTrailerVo1.getTrailerModel());
//采购单位 TODO
BaseTrailerVo baseTrailerVo2 = baseTrailerVos.get(1);
//挂车车型
baseQuotationVo.setGcOneModel(baseTrailerVo2.getTrailerModel());
//采购单位 TODO
}
//查询上装信息
return null;
}
}

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java

@ -73,5 +73,6 @@ public class BusSalesOrderVehicle extends BaseEntity {
@ApiModelProperty("贷款人")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String borrowName;
@ApiModelProperty("消贷合同sid")
private String loanContractSid;
}

9
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java

@ -76,7 +76,7 @@ public interface BusSalesOrderVehicleFeign {
@ApiOperation("根据销售订单车辆表的sid更新临时号码")
@PostMapping("/updateTemporaryNo")
@ResponseBody
ResultBean updateTemporaryNo(@RequestParam("sid") String sid, @RequestParam("temporaryNo") String temporaryNo,@RequestParam("temporaryName") String temporaryName);
ResultBean updateTemporaryNo(@RequestParam("sid") String sid, @RequestParam("temporaryNo") String temporaryNo, @RequestParam("temporaryName") String temporaryName);
@ApiOperation("根据sid查询")
@GetMapping("/fetchBySalesOrderVehiclerSid/{busVinSid}")
@ -124,5 +124,10 @@ public interface BusSalesOrderVehicleFeign {
@ApiOperation("更新订单车辆的贷款人sid和消贷合同sid")
@PostMapping("/updateXDCon")
@ResponseBody
ResultBean updateXDCon(@RequestParam("sid") String sid,@RequestParam("borrowerSid") String borrowerSid,@RequestParam("loanContractSid") String loanContractSid);
ResultBean updateXDCon(@RequestParam("sid") String sid, @RequestParam("borrowerSid") String borrowerSid, @RequestParam("loanContractSid") String loanContractSid);
@ApiOperation("根据销售订单sid和车辆sid查询销售订单车辆信息")
@PostMapping("/selectByOrderSidAndVehSid")
@ResponseBody
ResultBean<BusSalesOrderVehicle> selectByOrderSidAndVehSid(@RequestParam("sid") String sid, @RequestParam("vehSid") String vehSid);
}

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java

@ -118,4 +118,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
return null;
}
@Override
public ResultBean<BusSalesOrderVehicle> selectByOrderSidAndVehSid(String sid, String vehSid) {
return null;
}
}

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

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

11
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java

@ -75,8 +75,8 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
}
@Override
public ResultBean updateTemporaryNo(String sid, String temporaryNo,String temporaryName) {
return busSalesOrderVehicleService.updateTemporaryNo(sid, temporaryNo,temporaryName);
public ResultBean updateTemporaryNo(String sid, String temporaryNo, String temporaryName) {
return busSalesOrderVehicleService.updateTemporaryNo(sid, temporaryNo, temporaryName);
}
@Override
@ -130,7 +130,12 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
@Override
public ResultBean updateXDCon(String sid, String borrowerSid, String loanContractSid) {
return busSalesOrderVehicleService.updateXDCon(sid,borrowerSid,loanContractSid);
return busSalesOrderVehicleService.updateXDCon(sid, borrowerSid, loanContractSid);
}
@Override
public ResultBean<BusSalesOrderVehicle> selectByOrderSidAndVehSid(String sid, String vehSid) {
return busSalesOrderVehicleService.selectByOrderSidAndVehSid(sid, vehSid);
}

40
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@ -256,9 +256,9 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
return list;
}
public ResultBean updateTemporaryNo(String sid, String temporaryNo,String temporaryName) {
public ResultBean updateTemporaryNo(String sid, String temporaryNo, String temporaryName) {
ResultBean rb = ResultBean.fireFail();
baseMapper.updateTemporaryNo(sid, temporaryNo,temporaryName);
baseMapper.updateTemporaryNo(sid, temporaryNo, temporaryName);
return rb.success();
}
@ -294,8 +294,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
return baseMapper.selectByOrderSid(saleOrderSid);
}
public List<BusSalesOrderVehicle> selectListByOrderSid2(String saleOrderSid,String borrowSid) {
return baseMapper.selectByOrderSid2(saleOrderSid,borrowSid);
public List<BusSalesOrderVehicle> selectListByOrderSid2(String saleOrderSid, String borrowSid) {
return baseMapper.selectByOrderSid2(saleOrderSid, borrowSid);
}
public List<BusSalesOrderVehicle> selectListByOrderSid3(String saleOrderSid) {
@ -316,7 +316,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
if (busVehicleQKKPVos != null && busVehicleQKKPVos.size() > 0) {
for (BusVehicleQKKPVo record : busVehicleQKKPVos) {
String vehSid = record.getVehSid();
if (StringUtils.isNotBlank(vehSid)){
if (StringUtils.isNotBlank(vehSid)) {
BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vehSid).getData();
if (baseVehicleCertificateVo != null) {
record.setCertificateState(baseVehicleCertificateVo.getCertificateState());
@ -353,9 +353,9 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
}
//查询是否存在应收未收款项
ResultBean<List<String>> listResultBean = finUncollectedReceivablesDetailedFeign.selectByContractNoOne(query.getContractNo());
if(!listResultBean.getData().isEmpty()){
if (!listResultBean.getData().isEmpty()) {
listResultBean.getData().removeAll(Collections.singleton(null));
qw.notIn("bsov.sid",listResultBean.getData());
qw.notIn("bsov.sid", listResultBean.getData());
}
List<BusVehicleQKKPVo> busVehicleQKKPVos = baseMapper.appVehicleQKKPList(qw);
List<BusVehicleQKKPTrailerVo> busVehicleQKKPTrailerVos = new ArrayList<>();
@ -365,16 +365,16 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(record.getVehSid()).getData();
if (finBillVehicleDetailsVo != null) {
busVehicleQKKPVos.remove(record);
if (busVehicleQKKPVos.size() == 0){
if (busVehicleQKKPVos.size() == 0) {
break;
}
}
String vehSid = record.getVehSid();
if (StringUtils.isNotBlank(vehSid)){
if (StringUtils.isNotBlank(vehSid)) {
BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = busArrearsCarryVehicleApplyService.selSubmitLc(vehSid).getData();
if (busArrearsCarryVehicleApply != null){
if (busArrearsCarryVehicleApply != null) {
busVehicleQKKPVos.remove(record);
if (busVehicleQKKPVos.size() == 0){
if (busVehicleQKKPVos.size() == 0) {
break;
}
}
@ -539,6 +539,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.fetchByLSBM(fNumber);
return rb.success().setData(busSalesOrderVehicle);
}
/**
* 欠款提车查询已选车辆的关联的销售订单的车辆sid
*
@ -547,28 +548,29 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
* @return
*/
public List<String> selectByVinSidAndContractNo(List<String> vinSidList, String contractId) {
return baseMapper.selectByVinSidAndContractNo(vinSidList,contractId);
return baseMapper.selectByVinSidAndContractNo(vinSidList, contractId);
}
public ResultBean<List<String>> selectListByvinNo(String vinNo) {
ResultBean rb = ResultBean.fireFail();
List<String> sids = baseMapper.selectListByvinNo(vinNo);
List<String> sids = baseMapper.selectListByvinNo(vinNo);
return rb.success().setData(sids);
}
/**
* 通过vehSid查询
*
* @param vehSid
* @return
*/
public BusSalesOrderVehicle selectOneByVehSidAndOrderSid(String vehSid,String orderSid) {
public BusSalesOrderVehicle selectOneByVehSidAndOrderSid(String vehSid, String orderSid) {
return baseMapper.selectOneByVehSidAndOrderSid(vehSid,orderSid);
return baseMapper.selectOneByVehSidAndOrderSid(vehSid, orderSid);
}
public ResultBean updateXDCon(String sid, String borrowerSid, String loanContractSid) {
ResultBean rb = ResultBean.fireFail();
baseMapper.updateXDCon(sid,borrowerSid,loanContractSid);
baseMapper.updateXDCon(sid, borrowerSid, loanContractSid);
return rb.success();
}
@ -587,4 +589,10 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
public BusSalesOrderVehicle selectByBorrowSid(String sid) {
return baseMapper.selectByBorrowSid(sid);
}
public ResultBean<BusSalesOrderVehicle> selectByOrderSidAndVehSid(String sid, String vehSid) {
ResultBean rb = ResultBean.fireFail();
BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectByOrderSidAndVehSid(sid, vehSid);
return rb.success().setData(busSalesOrderVehicle);
}
}

10
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@ -2654,11 +2654,14 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
finBillVehicleService.updateByMainSid(finBillApplication.getSid());
//查询销售订单信息
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplication.getContractNo()).getData();
//查询开票车辆信息
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchByMainSid(query.getBusinessSid());
List<BaseVehicleStateDto> baseVehicleStateDtos = new ArrayList<>();
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finBillApplication.getContractNo(), finBillVehicleVo.getVehSid()).getData();
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByOrderSidAndVehSid(busSalesOrder.getSid(), finBillVehicleVo.getVehSid()).getData();
baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid());
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKKPZZ.getTypeKey());
baseVehicleStateDtos.add(baseVehicleStateDto);
@ -2676,11 +2679,14 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
finBillVehicleService.updateByMainSid(finBillApplication.getSid());
//查询销售订单信息
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplication.getContractNo()).getData();
//查询开票车辆信息
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchByMainSid(query.getBusinessSid());
List<BaseVehicleStateDto> baseVehicleStateDtos = new ArrayList<>();
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finBillApplication.getContractNo(), finBillVehicleVo.getVehSid()).getData();
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByOrderSidAndVehSid(busSalesOrder.getSid(), finBillVehicleVo.getVehSid()).getData();
baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid());
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKKPZZ.getTypeKey());
baseVehicleStateDtos.add(baseVehicleStateDto);

1
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

@ -259,6 +259,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
if (StringUtils.isNotBlank(query.getName())) {
//TODO
}
qw.orderByDesc("createTime");
IPage<LoanPreloanCreditApply> page = PagerUtil.queryToPage(pq);
IPage<LoanPreloanCreditApplyVo> pagging = baseMapper.selectPageVo(page, qw);
for (LoanPreloanCreditApplyVo record : pagging.getRecords()) {

Loading…
Cancel
Save