款项结转问题优化

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

@@ -62,6 +62,8 @@ public class BaseVehicleOutVoExeclNew {
     private String rebateMoneyTwo;
     @ExportEntityMap(CnName = "内部引荐人姓名", EnName = "innerName")
     private String innerName;
+    @ExportEntityMap(CnName = "贴息", EnName = "factoryDiscount")
+    private String factoryDiscount;
     @ApiModelProperty("分公司sid")
     private String createOrgSid;
 }

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

@@ -35,6 +35,7 @@ import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApply;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyDetailQuery;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyDetailVo;
 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.bussalesordervehicle.BusSalesOrderVehicle;
@@ -52,6 +53,8 @@ import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoDetailsVo;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.*;
 import com.yxt.common.core.query.PagerQuery;
@@ -110,6 +113,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
     private com.yxt.anrui.portal.api.flow.FlowableFeign flowableFeignPro;
     @Autowired
     private BusDeliveredApplyFeign busDeliveredApplyFeign;
+    @Autowired
+    private LoanSolutionsFeign loanSolutionsFeign;
 
     public ResultBean<Boolean> vehicleOut(BaseVehicleOutDto dto) {
         log.info("BaseVehicleOutService-vehicleOut-95:{}", JSONObject.toJSONString(dto));
@@ -1913,6 +1918,18 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
             baseVehicleOutVoExeclNew.setCreateOrgName(sysOrganizationVo.getName());
             id = id + 1;
+            //贴息
+            String concatNo = baseVehicleOutVoExeclNew.getConcatNo();
+            BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(concatNo).getData();
+            if (busSalesOrder != null) {
+                String saleOrderSid = busSalesOrder.getSid();
+                if (StringUtils.isNotBlank(saleOrderSid)) {
+                    SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetailsss(saleOrderSid).getData();
+                    if (solutionsDetailsVo != null) {
+                        baseVehicleOutVoExeclNew.setFactoryDiscount(solutionsDetailsVo.getFactoryDiscount());
+                    }
+                }
+            }
         }
         return baseVehicleOutVoExeclNews;
     }