diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml index 0becc8b52d..fe10d13d5d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml @@ -243,7 +243,7 @@ bmc.independentSources, bmc.fuelTank, bmc.multimedia, - bvc.guidedPrice, + bvc.guidedPrice as price, bmc.otherConfig FROM base_vehmodel_config bvc LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java index 5a8ca52e07..5b5746439b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java @@ -47,7 +47,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -473,8 +472,11 @@ public class BaseVehmodelConfigService extends MybatisBaseService selectCarConfigSummary(String modelSid, String configSid, String userSid) { ResultBean rb = ResultBean.fireFail(); - String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid(); - AppModelConfigListVo appModelConfigListVo = baseMapper.selectCarConfigSummary(modelSid, configSid, useOrgSid); + ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); + if (!resultBean.getSuccess()) { + return rb.setData(new AppCarConfigSummaryVo()); + } + AppModelConfigListVo appModelConfigListVo = baseMapper.selectCarConfigSummary(modelSid, configSid, resultBean.getData()); if (appModelConfigListVo != null) { AppCarConfigSummaryVo configSummaryVo = addConfigName(appModelConfigListVo); return rb.success().setData(configSummaryVo); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousFeignFallback.java index 4f8b5f247c..31824044a3 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousFeignFallback.java @@ -25,13 +25,8 @@ *********************************************************/ package com.yxt.anrui.buscenter.api.busdepositfictitious; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; -import java.util.List; - /** * Project: anrui-buscenter(业务管理)
* File: BusDepositFictitiousFeignFallback.java
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelRest.java index af8e67ec84..4c770bca07 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelRest.java @@ -29,6 +29,7 @@ import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelFeign; import com.yxt.anrui.buscenter.api.bussalesordermodel.app.AppBusSalesOrderModelDto; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -50,9 +51,11 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("v1/bussalesordermodel") public class BusSalesOrderModelRest implements BusSalesOrderModelFeign { + @Autowired + private BusSalesOrderModelService busSalesOrderModelService; @Override public ResultBean save(AppBusSalesOrderModelDto dto) { - return null; + return busSalesOrderModelService.saveApp(dto); } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java index c84efbd46d..c38ae878d0 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java @@ -30,7 +30,9 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.AppOrderInfo; import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel; import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo; import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDto; +import com.yxt.anrui.buscenter.api.bussalesordermodel.app.AppBusSalesOrderModelDto; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.result.ResultBean; import org.springframework.stereotype.Service; /** @@ -100,4 +102,9 @@ public class BusSalesOrderModelService extends MybatisBaseService