diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java index 7e114285f9..eb65c076e7 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java @@ -88,6 +88,7 @@ public class AppOrderDetailsVo implements Vo { private String financePlanValue; @ApiModelProperty("付款类型") private String payTypeKey; + private String payType; @ApiModelProperty("分公司sid") private String useOrgSid; diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/ScheduledService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/ScheduledService.java index 2442598784..2303adf897 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/ScheduledService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/ScheduledService.java @@ -40,8 +40,8 @@ public class ScheduledService { Calendar calendar = Calendar.getInstance(); calendar.setTime(now); //+1今天的时间加一天 -// calendar.add(Calendar.DAY_OF_MONTH, -4); - calendar.add(Calendar.DAY_OF_MONTH, -2); + calendar.add(Calendar.DAY_OF_MONTH, -4); +// calendar.add(Calendar.DAY_OF_MONTH, -2); String tomorrow = sdf.format(calendar.getTime()); //查询简易订单-车辆预定中 //查询修改日期包含该日期的已经通过的简易订车单 diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index 02b7b1abc2..7a1d7d36f9 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -2030,6 +2030,7 @@ public class BusMainDepositService extends MybatisBaseService list = new ArrayList<>(); if (StringUtils.isNotBlank(busDeposit.getVehicleNum())) { List customerList = busDepositCustomerService.selectListByBillSid(bv.getBusinessSid()); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 0197442983..fa40a4a586 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -198,6 +198,7 @@ bo.billNo, bo.financePlanValue, bo.payTypeKey, + bo.payType, bo.useOrgSid, bo.licensePlateValue from bus_sales_order bo @@ -279,6 +280,8 @@ \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java index e85ff94957..eef702f8f5 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java @@ -59,4 +59,10 @@ public class FinConfirmDto implements Dto { @ApiModelProperty("业务单据编号") private String busNo; + @ApiModelProperty("审核状态") + private Integer auditState; + + @ApiModelProperty("创建人名称") + private String createByName; + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapply.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapply.java index 8d5dc9b024..051c8b5d56 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapply.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapply.java @@ -90,4 +90,6 @@ public class FinCostapply extends BaseEntity { @ApiModelProperty(value = "任务id") private String taskId; + private String orgSidPath; + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyDto.java index c2653d8793..23470a0b9e 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyDto.java @@ -84,4 +84,6 @@ public class FinCostapplyDto implements Dto { @ApiModelProperty(value = "备注") private String remarks; + private String orgSidPath; + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapply.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapply.java index 58216cb8fc..f892ed2ee7 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapply.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapply.java @@ -108,4 +108,6 @@ public class FinPaymentapply extends BaseEntity { @ApiModelProperty(value = "品牌名称") private String carBrandName; + private String orgSidPath; + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java index a96c9138ca..d9c7d1f20f 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java @@ -97,4 +97,6 @@ public class FinPaymentapplyDto implements Dto { @ApiModelProperty(value = "品牌名称") private String carBrandName; + private String orgSidPath; + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index bd81f833b1..3501b0320c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -41,11 +41,10 @@ import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredDto; import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredFeign; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; 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.bussalesorderprice.BusSalesOrderPrice; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; @@ -1131,7 +1130,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, 1); - if(finSelectedReceivablesDetailedVos.size()>0){ + if (finSelectedReceivablesDetailedVos.size() > 0) { finSelectedReceivablesDetailedVos.stream().forEach(v -> { //已选款项明细sid String selectSid = v.getSid(); @@ -1152,10 +1151,41 @@ public class FinCollectionConfirmationService extends MybatisBaseService voList = finSelectedReceivablesDetailedService.selectListByVin(v.getContractNo(),v.getVIN()); + List voList = finSelectedReceivablesDetailedService.selectListByVin(v.getContractNo(), v.getVIN(),3); BigDecimal bigDecimalVinAll = voList.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); //查询该合同编号下的销售订单的单车成交价 - ResultBean resultBean = busSalesOrderFeign.selectByContractNo(v.getContractNo()); + ResultBean commonContractResultBean = commonContractFeign.selectByNo(v.getContractNo()); + if (commonContractResultBean.getSuccess()) { + CommonContract commonContract = commonContractResultBean.getData(); + if (commonContract != null) { + ResultBean orderDetails = busSalesOrderFeign.getSaleOrderDetails(commonContract.getBusSid()); + AppOrderDetailsVo vo = orderDetails.getData(); + if (vo != null) { + AppOrderPriceInfoVo priceInfoVo = vo.getPriceInfo(); + BigDecimal singleFinalPrice = new BigDecimal(priceInfoVo.getSingleFinalPrice()); + if (singleFinalPrice.compareTo(bigDecimalVinAll) == 0) {//推送待出库 + BusDeliveredDto busDeliveredDto = new BusDeliveredDto(); + busDeliveredDto.setSubscriptionKey(VehicleStateTempOrLast.PaymentEnum.PAY_MODELS.getCode()); + busDeliveredDto.setSubscription(VehicleStateTempOrLast.PaymentEnum.PAY_MODELS.getRemarks()); + busDeliveredDto.setPaymentMethodKey(vo.getPayTypeKey()); + busDeliveredDto.setPaymentMethod(vo.getPayType()); + busDeliveredDto.setContractNo(v.getContractNo()); + busDeliveredDto.setName(v.getCustomerName()); + busDeliveredDto.setVinNo(v.getVIN()); + busDeliveredDto.setMobile(v.getCustomerPhone()); + busDeliveredDto.setPrice(priceInfoVo.getSingleFinalPrice()); + //根据客户sid查询客户的身份证号和 + AppOrderModelInfoVo appOrderModelInfoVo = vo.getModelInfo(); + busDeliveredDto.setModelName(appOrderModelInfoVo.getModelName()); + ResultBean resultBean1 = busDeliveredFeign.save(busDeliveredDto); + + } + + + } + } + } + /*ResultBean resultBean = busSalesOrderFeign.selectByContractNo(v.getContractNo()); if(resultBean.getSuccess()){ BusSalesOrderPrice busSalesOrderPrice = resultBean.getData(); BigDecimal singleFinalPrice = busSalesOrderPrice.getSingleFinalPrice(); @@ -1186,7 +1216,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { + //======================================= + String orgSidPath = dto.getOrgSidPath(); + if(StringUtils.isBlank(orgSidPath)){ + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + } + //=========================================== //新增 FinCostapply finCostapply = new FinCostapply(); BeanUtil.copyProperties(dto, finCostapply, "sid"); + finCostapply.setOrgSidPath(orgSidPath); String billNo = getApplyCode(dto); if (finCostapply.getIsVeh() == 1) { if (finCostapply.getIsOutDoor() == null) { @@ -174,7 +191,7 @@ public class FinCostapplyService extends MybatisBaseService resultBean = saveOrUpdateDto(dto); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -405,6 +423,7 @@ public class FinCostapplyService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java index c1dc8409bd..3b95359417 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java @@ -157,11 +157,26 @@ public class FinPaymentapplyService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + } FinPaymentapply finPaymentapply = new FinPaymentapply(); BeanUtil.copyProperties(dto, finPaymentapply, "sid"); String billNo = getApplyCode(dto); finPaymentapply.setBillNo(billNo); - + finPaymentapply.setOrgSidPath(orgSidPath); List detailsList = dto.getDetailsList(); String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid()); if ("1".equals(dto.getIsVeh())) { @@ -177,7 +192,7 @@ public class FinPaymentapplyService extends MybatisBaseService detailsList = dto.getDetailsList(); String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid()); @@ -252,6 +267,7 @@ public class FinPaymentapplyService extends MybatisBaseService resultBean = saveOrUpdateDto(dto); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -383,6 +399,7 @@ public class FinPaymentapplyService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java index 17ff3f2fcb..cac364c712 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java @@ -102,7 +102,7 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper selectListByAuditState(@Param("i") int i,@Param("userSid") String userSid,@Param("useOrgSid") String useOrgSid); - List selectListByVin(@Param("contractNo") String contractNo, @Param("vinNo") String vin); + List selectListByVin(@Param("contractNo") String contractNo, @Param("vinNo") String vin,@Param("state") int state); List getList(@Param("list") List sidsList); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index 90fe26ee5d..896540f1ba 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -106,7 +106,7 @@ select * from fin_selected_receivables_detailed where contractNo = #{contractNo} - and VIN = #{vinNo} + and VIN = #{vinNo} and auditState = #{state}