|
|
@ -62,6 +62,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscount; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; |
|
|
|
import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandoverDto; |
|
|
|
import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandoverFeign; |
|
|
|
import com.yxt.anrui.buscenter.biz.busdelivered.BusDeliveredService; |
|
|
|
import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDetailsService; |
|
|
|
import com.yxt.anrui.buscenter.biz.busdelivereddetailsdiscount.BusDeliveredDetailsDiscountService; |
|
|
@ -180,6 +182,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp |
|
|
|
private BaseMiddlemanFeign baseMiddlemanFeign; |
|
|
|
@Autowired |
|
|
|
private BaseVehicleOutFeign baseVehicleOutFeign; |
|
|
|
@Autowired |
|
|
|
private BusVehicleInformationHandoverFeign busVehicleInformationHandoverFeign; |
|
|
|
|
|
|
|
/** |
|
|
|
* 构造出库申请的查询条件 |
|
|
@ -658,6 +662,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp |
|
|
|
Future future3 = pool.submit(() -> { |
|
|
|
pushOutApply(busDeliveredApply, detailsList, orderDetailsVoResultBean.getData(), userVoResultBean.getData()); |
|
|
|
}); |
|
|
|
Future future4 = pool.submit(() -> { |
|
|
|
pushVehicleInforHandov(busDeliveredApply, detailsList, orderDetailsVoResultBean.getData(), userVoResultBean.getData()); |
|
|
|
}); |
|
|
|
} catch (Exception e) { |
|
|
|
e.printStackTrace(); |
|
|
|
log.error("推送数据失败=========================" + e.getMessage()); |
|
|
@ -681,6 +688,42 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 推送随车资料 |
|
|
|
* @param busDeliveredApply |
|
|
|
* @param detailsList |
|
|
|
* @param data |
|
|
|
* @param data1 |
|
|
|
*/ |
|
|
|
private void pushVehicleInforHandov(BusDeliveredApply busDeliveredApply, List<BusDeliveredApplyDetails> detailsList, AppOrderDetailsVo data, SysUserVo data1) { |
|
|
|
if(!detailsList.isEmpty()){ |
|
|
|
for (int i = 0; i < detailsList.size(); i++) { |
|
|
|
BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i); |
|
|
|
BusVehicleInformationHandoverDto dto = new BusVehicleInformationHandoverDto(); |
|
|
|
dto.setBusSid(busDeliveredApplyDetails.getSid()); |
|
|
|
dto.setCreateBySid(busDeliveredApply.getCreateBySid()); |
|
|
|
dto.setVinNo(busDeliveredApplyDetails.getVinNo()); |
|
|
|
dto.setVehicleSid(busDeliveredApplyDetails.getVinSid()); |
|
|
|
if ("1".equals(busDeliveredApply.getPaymentMethodKey())) { |
|
|
|
dto.setCustomerName(busDeliveredApply.getName()); |
|
|
|
} else { |
|
|
|
dto.setCustomerName(busDeliveredApply.getLoanName()); |
|
|
|
} |
|
|
|
dto.setModel(busDeliveredApply.getModelName()); |
|
|
|
dto.setModelSid(busDeliveredApply.getModelSid()); |
|
|
|
dto.setContractNo(busDeliveredApply.getContractNo()); |
|
|
|
dto.setRecName(busDeliveredApply.getStaffName()); |
|
|
|
dto.setRecPhone(data1.getMobile()); |
|
|
|
dto.setUseOrgSid(busDeliveredApply.getUseOrgSid()); |
|
|
|
ResultBean<SysOrganizationVo> organizationVoResultBean = sysOrganizationFeign.fetchBySid(busDeliveredApply.getUseOrgSid()); |
|
|
|
if (organizationVoResultBean.getData() != null) { |
|
|
|
dto.setUseOrgName(organizationVoResultBean.getData().getName()); |
|
|
|
} |
|
|
|
busVehicleInformationHandoverFeign.saveOrUpdate(dto); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 出库办理后推送开票 |
|
|
|
* |
|
|
|