diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 84983cdb72..d512bcc50b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer; +import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank; import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig; import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplication; @@ -18,6 +19,7 @@ import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo; import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService; +import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService; import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService; import com.yxt.anrui.base.biz.baseoutsourcingapplication.BaseOutsourcingApplicationService; import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; @@ -118,6 +120,8 @@ public class BaseVehicleRest implements BaseVehicleFeign { private SysUserFeign sysUserFeign; @Autowired private BaseManufacturerService baseManufacturerService; + @Autowired + private BaseManufacturerBankService baseManufacturerBankService; @Override public ResultBean> pagerList(@RequestBody PagerQuery pagerQuery) { @@ -275,7 +279,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { } if(ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())){//外采 //根据外采编号查询外采的申请人部门 - BaseOutsourcingApplication baseOutsourcingApplication = baseOutsourcingApplicationService.selectByNo(baseVehicle.getWarrantyCardNo()); + BaseOutsourcingApplication baseOutsourcingApplication = baseOutsourcingApplicationService.selectByNo(baseVehicle.getOrderingNo()); String createBySid = baseOutsourcingApplication.getCreateBySid(); //查询该申请人的部门 ResultBean sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(createBySid); @@ -290,7 +294,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(baseOutsourcingApplication.getPurchasingUnitSid()); stkInStock.setFSupplierId(baseManufacturer.getManufacturerCode()); - }else if(ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())){//厂家采购 + }else if(ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey()) || ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())){//厂家采购 ResultBean pcResubean = sysOrganizationFeign.fetchBySid(baseVehicle.getPurchaseSystemSid()); if (pcResubean.getSuccess()) { SysOrganizationVo vo = pcResubean.getData(); @@ -332,9 +336,14 @@ public class BaseVehicleRest implements BaseVehicleFeign { * 单价 对应厂家结算价 */ sf.setFPrice(baseVehicleDto.getCostPrice() + ""); - if(ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())){ - sf.setCllx(baseVehicleDto.getManufSaleAccessName()); - sf.setCllxType("sellChannel"); + if(ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey()) || ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())){ + //根据sid查询 + BaseManufacturerBank baseManufacturerBank = baseManufacturerBankService.fetchBySid(baseVehicle.getManufSaleAccessSid()); + if(baseManufacturerBank != null){ + sf.setCllx(baseManufacturerBank.getActualPayKey()); + sf.setCllxType("sellChannel"); + } + }else if(ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())){ /** * 车辆类型