Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -52,8 +52,10 @@ import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDet
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply;
 import com.yxt.anrui.fin.api.finpaymentrecord.*;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
 import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill;
 import com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyService;
+import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRService;
 import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService;
 import com.yxt.anrui.portal.api.flow.FlowableFeign;
 import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
@@ -66,6 +68,14 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.api.sysuser.UserQuery;
+import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.LoanBePadsincereApply;
+import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.LoanBePadsincereApplyDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.LoanBePadsincereApplyFeign;
+import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehFeign;
+import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
+import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsFeign;
+import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanMoneyVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.ConstantUtils;
@@ -148,6 +158,14 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
     private BaseVehicleActualDetailsFeign baseVehicleActualDetailsFeign;
     @Autowired
     private MessageListFeign messageListFeign;
+    @Autowired
+    private LoanBePadsincereApplyFeign loanBePadsincereApplyFeign;
+    @Autowired
+    private LoanBePadsincereVehFeign loanBePadsincereVehFeign;
+    @Autowired
+    private LoanRepaymentPlanDetailsFeign loanRepaymentPlanDetailsFeign;
+    @Autowired
+    private FinUncollectedReceivablesDetailedJRService finUncollectedReceivablesDetailedJRService;
 
     public PagerVo<FinPaymentrecordVo> listPageVo(PagerQuery<FinPaymentrecordQuery> pq) {
         FinPaymentrecordQuery query = pq.getParams();
@@ -339,6 +357,36 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         List<String> list = new ArrayList<>();
         for (int i = 0; i < sids.size(); i++) {
             FinPaymentrecord finPaymentrecord = fetchBySid(sids.get(i));
+            //更新还款计划表垫款金额和逾期利息
+            if ("007".equals(finPaymentrecord.getCostTypeKey())){
+                List<LoanBePadsincereVehDetailsVo> loanBePadsincereVehDetailsVos = loanBePadsincereVehFeign.selByMainSid(finPaymentrecord.getBusSid()).getData();
+                for (LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo : loanBePadsincereVehDetailsVos) {
+                    LoanRepaymentPlanMoneyVo loanRepaymentPlanMoneyVo = loanRepaymentPlanDetailsFeign.selVehSidAndPeriod(loanBePadsincereVehDetailsVo.getBusVinSid(), loanBePadsincereVehDetailsVo.getPeriod()).getData();
+                    LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsFeign.fetchDetails(loanRepaymentPlanMoneyVo.getSid()).getData();
+                    String paymentMoney = loanRepaymentPlanMoneyVo.getPaymentMoney().add(new BigDecimal(loanBePadsincereVehDetailsVo.getPadMoney())).toString();
+                    String paymentInterest = loanRepaymentPlanMoneyVo.getPaymentInterest().add(new BigDecimal(loanBePadsincereVehDetailsVo.getBankBeInter())).toString();
+                    loanRepaymentPlanDetailsFeign.updateVehSidAndPeriod(loanBePadsincereVehDetailsVo.getBusVinSid(), loanBePadsincereVehDetailsVo.getPeriod(),paymentMoney,paymentInterest);
+                    //推送金融应收
+                    FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
+                    jr.setCreateBySid(finPaymentrecord.getCreateBySid());
+                    SysUserVo userVo = sysUserFeign.fetchBySid(finPaymentrecord.getCreateBySid()).getData();
+                    jr.setCreateByName(userVo.getName());
+                    jr.setBusSid(planDetails.getSid());
+                    jr.setApplySid(finPaymentrecord.getBusSid());
+                    jr.setCurrentReceivableMoney(new BigDecimal(paymentInterest));
+                    jr.setReveivableMoney(new BigDecimal(paymentInterest));
+                    jr.setPayCostTitleKey("005");
+                    jr.setPayCostTitleValue("资方逾期利息");
+                    jr.setOrgSidPath(planDetails.getOrgSidPath());
+                    jr.setUseOrgName(planDetails.getUseOrgName());
+                    jr.setUseOrgSid(planDetails.getUseOrgSid());
+                    jr.setStaffDeptName(planDetails.getDept());
+                    jr.setStaffName(planDetails.getStaffName());
+                    jr.setStaffDeptSid(planDetails.getDeptSid());
+                    jr.setStaffUserSid(planDetails.getSalesUserSid());
+                    finUncollectedReceivablesDetailedJRService.insert(jr);
+                }
+            }
             FinPaymentrecord finPaymentrecordOne = null;
             if (new BigDecimal(dto.getCost()).compareTo(finPaymentrecord.getAccountsReceive())<0) {//实收金额小于应收金额
                 finPaymentrecordOne = new FinPaymentrecord();

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehFeign.java

@@ -75,4 +75,9 @@ public interface LoanBePadsincereVehFeign {
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<LoanBePadsincereVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("根据主表sid查询")
+    @GetMapping("/selByMainSid")
+    @ResponseBody
+    ResultBean<List<LoanBePadsincereVehDetailsVo>> selByMainSid(@RequestParam("applySid") String applySid);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehFeignFallback.java

@@ -69,4 +69,9 @@ public class LoanBePadsincereVehFeignFallback implements LoanBePadsincereVehFeig
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-riskcenter/loanbepadsincereveh/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean<List<LoanBePadsincereVehDetailsVo>> selByMainSid(String applySid) {
+		return null;
+	}
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeign.java

@@ -53,4 +53,13 @@ public interface LoanRepaymentPlanDetailsFeign {
     @ResponseBody
     public ResultBean<LoanRepaymentPlanDetailsForOverDue> checkOverDue(@RequestParam("sid") String sid);
 
+    @ApiOperation("根据销售订单车辆sid及期数查询")
+    @GetMapping("/selVehSidAndPeriod")
+    @ResponseBody
+    ResultBean<LoanRepaymentPlanMoneyVo> selVehSidAndPeriod(@RequestParam("busVinSid") String busVinSid,@RequestParam("period") String period);
+
+    @ApiOperation("根据销售订单车辆sid及期数修改")
+    @PostMapping("/updateVehSidAndPeriod")
+    @ResponseBody
+    ResultBean updateVehSidAndPeriod(@RequestParam("busVinSid") String busVinSid,@RequestParam("period") String period,@RequestParam("paymentMoney") String paymentMoney,@RequestParam("paymentInterest") String paymentInterest);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeignFallback.java

@@ -46,4 +46,14 @@ public class LoanRepaymentPlanDetailsFeignFallback implements LoanRepaymentPlanD
     public ResultBean<LoanRepaymentPlanDetailsForOverDue> checkOverDue(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean<LoanRepaymentPlanMoneyVo> selVehSidAndPeriod(String busVinSid, String period) {
+        return null;
+    }
+
+    @Override
+    public ResultBean updateVehSidAndPeriod(String busVinSid, String period, String paymentMoney, String paymentInterest) {
+        return null;
+    }
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanMoneyVo.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.riskcenter.api.loanrepaymentplandetails;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class LoanRepaymentPlanMoneyVo {
+
+    private String sid;
+    private BigDecimal paymentMoney; //公司垫款金额
+    private BigDecimal paymentInterest; //垫资方逾期利息
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanreturninboundapply/ReturnAppVo.java

@@ -1,7 +1,13 @@
 package com.yxt.anrui.riskcenter.api.loanreturninboundapply;
 
+import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
+import com.yxt.anrui.riskcenter.api.loanreturninboundtrailer.LoanReturnInboundTrailerDto;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -9,4 +15,90 @@ import lombok.Data;
  **/
 @Data
 public class ReturnAppVo {
+
+    @ApiModelProperty("申请部门")
+    private String createDept;
+
+    @ApiModelProperty("申请人")
+    private String createByName;
+    @ApiModelProperty("发起日期")
+    private String createDate;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("首次登记日期")
+    private String firstDate;
+    @ApiModelProperty("车型名称")
+    private String modelName;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("配置sid")
+    private String configSid;
+    @ApiModelProperty("配置名称")
+    private String configName;
+    @ApiModelProperty("是否带挂车")
+    private String tralier;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    @ApiModelProperty("贷款人")
+    private String loanName;
+    @ApiModelProperty("贷款合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("资方合同编号")
+    private String bankContractNo;
+    @ApiModelProperty("入库价")
+    private int inboundMoney;
+    @ApiModelProperty("停放地点")
+    private String locationName;
+
+    @ApiModelProperty("停车收费标准")
+    private String parkFees;
+    @ApiModelProperty("已还金额")
+    private String alRepaidMoney;
+    @ApiModelProperty("当前逾期金额")
+    private String currentBeMoney;
+    @ApiModelProperty("其中资金占用费")
+    private String wheFundOccMoney;
+    @ApiModelProperty("未到期金额")
+    private String unexpiredMoney;
+    @ApiModelProperty("总期数")
+    private String nper;
+    @ApiModelProperty("当前期数")
+    private String currentPeriod;
+    @ApiModelProperty("已还金额换算期数")
+    private String alRepaidMoneyConPeriod;
+    @ApiModelProperty("逾期金额换算期数")
+    private String beOverdueMoneyAndPeriod;
+
+
+    private String remarks;
+
+    private List<String> filesList = new ArrayList<>();
+
+
+    private String files;
+
+    @ApiModelProperty(value = "任务id")
+    private String taskId;
+    @ApiModelProperty(value = "流程实例id")
+    private String procInstId;
+
+
+    @ApiModelProperty("挂车车架号")
+    private String vinNoTrailer;
+    @ApiModelProperty("挂车车牌号")
+    private String vehMarkTrailer;
+    @ApiModelProperty("挂车类型")
+    private String trailerType;
+    @ApiModelProperty("挂车入库价")
+    private String inboundMoneyTrailer;
+    @ApiModelProperty("挂车备注")
+    private String remarksTrailer;
+
+    private String orgPath;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanreturnvehledger/LoanReturnVehLedger.java

@@ -61,10 +61,10 @@ public class LoanReturnVehLedger extends BaseEntity {
     private String useOrgName;
     @ApiModelProperty("组织全路径")
     private String orgSidPath;
-    @ApiModelProperty("逾期金额")
+   /* @ApiModelProperty("逾期金额")
     private BigDecimal overMoney;
     @ApiModelProperty("未到期金额")
-    private BigDecimal notBecomeDueMoney;
+    private BigDecimal notBecomeDueMoney;*/
 
     private String pSid;
     @ApiModelProperty("销售订单sid")
@@ -72,9 +72,9 @@ public class LoanReturnVehLedger extends BaseEntity {
     @ApiModelProperty("销售订单车辆sid")
     private String busVinSid;
     @ApiModelProperty("库存状态")
-    private String vehicleState;
+    private String stockState;
     @ApiModelProperty("库存状态key")
-    private String vehicleStateKey;
+    private String stockStateKey;
     @ApiModelProperty("业务sid")
     private String busSid;
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanreturnvehledger/LoanReturnVehLedgerDto.java

@@ -16,7 +16,7 @@ public class LoanReturnVehLedgerDto {
 
     private String sid;
 
-    @ApiModelProperty("车牌号")
+   /* @ApiModelProperty("车牌号")
     private String vehMark;
     @ApiModelProperty("车辆类型")
     private String vehType;
@@ -37,12 +37,12 @@ public class LoanReturnVehLedgerDto {
     @ApiModelProperty("贷款人")
     private String borrowerName;
     @ApiModelProperty("贷款人sid")
-    private String borrowerSid;
+    private String borrowerSid;*/
     @ApiModelProperty("存放地点")
     private String location;
     @ApiModelProperty("存放地点sid")
     private String locationSid;
-    @ApiModelProperty("处置方式key")
+   /* @ApiModelProperty("处置方式key")
     private String disposalKey;
     @ApiModelProperty("处置方式")
     private String disposal;
@@ -60,7 +60,7 @@ public class LoanReturnVehLedgerDto {
     @ApiModelProperty("库存状态")
     private String vehicleState;
     @ApiModelProperty("库存状态key")
-    private String vehicleStateKey;
+    private String vehicleStateKey;*/
 
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanreturnvehledger/LoanReturnVehLedgerQuery.java

@@ -40,7 +40,7 @@ public class LoanReturnVehLedgerQuery implements Query {
     @ApiModelProperty("出库日期结束")
     private String outboundDateEnd;
     @ApiModelProperty("库存状态")
-    private String vehicleState;
+    private String vehicleStateKey;
 
     private String menuUrl;
     private String orgPath;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanreturnvehledger/ReturnVehType.java

@@ -0,0 +1,69 @@
+package com.yxt.anrui.riskcenter.api.loanreturnvehledger;
+
+import lombok.Getter;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/23
+ **/
+public class ReturnVehType {
+
+    @Getter
+    public static enum ReturnVehicleState {
+
+        KC("0001", "库存"),
+        CK("0002", "出库"),
+        ;
+
+        /**
+         * code值
+         */
+        private final String code;
+        /**
+         * 备注
+         */
+        private final String remarks;
+
+        /**
+         * 构造器
+         *
+         * @param code    code值
+         * @param remarks 备注
+         */
+        private ReturnVehicleState(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
+
+    @Getter
+    public static enum Disposal {
+
+        WCZ("01", "未处置"),
+        KHSH("02", "客户赎回"),
+        ECXS("03", "二次销售"),
+        ECZZ("04", "二次转租"),
+        ;
+
+        /**
+         * code值
+         */
+        private final String code;
+        /**
+         * 备注
+         */
+        private final String remarks;
+
+        /**
+         * 构造器
+         *
+         * @param code    code值
+         * @param remarks 备注
+         */
+        private Disposal(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java

@@ -61,6 +61,7 @@ import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDetai
 import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDto;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
+import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanMoneyVo;
 import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleDetailsVo;
 import com.yxt.anrui.riskcenter.biz.loanbepadsincereveh.LoanBePadsincereVehService;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
@@ -910,7 +911,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 for (LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo : loanBePadsincereVehDetailsVos) {
                     FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
-                    finPaymentrecordDto.setApplySid(loanBePadsincereApply.getSid());
+                    finPaymentrecordDto.setApplySid("");
                     finPaymentrecordDto.setPayCompanySid("");
                     finPaymentrecordDto.setPayType(1);
                     finPaymentrecordDto.setCreateOrgSid(loanBePadsincereApply.getUseOrgSid());

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehRest.java

@@ -97,4 +97,11 @@ public class LoanBePadsincereVehRest implements LoanBePadsincereVehFeign {
 		LoanBePadsincereVehDetailsVo vo = loanBePadsincereVehService.fetchDetailsVoBySid(sid);
 		return rb.success().setData(vo);
 	}
+
+	@Override
+	public ResultBean<List<LoanBePadsincereVehDetailsVo>> selByMainSid(String applySid) {
+		ResultBean rb = ResultBean.fireFail();
+		List<LoanBePadsincereVehDetailsVo> loanBePadsincereVehDetailsVos = loanBePadsincereVehService.selByMainSid(applySid);
+		return rb.success().setData(loanBePadsincereVehDetailsVos);
+	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java

@@ -66,4 +66,8 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper<LoanRepayment
     String getOtherBankName(@Param("sid") String sid);
 
     LoanRepaymentPlanDetailsForOverDue checkOverDue(@Param("sid") String sid);
+
+    LoanRepaymentPlanMoneyVo selVehSidAndPeriod(@Param("busVinSid") String busVinSid,@Param("period") String period);
+
+    void updateVehSidAndPeriod(@Param("busVinSid") String busVinSid,@Param("period") String period,@Param("paymentMoney") String paymentMoney,@Param("paymentInterest") String paymentInterest);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml

@@ -540,4 +540,26 @@
         WHERE c.planSid = #{sid}
 
     </select>
+
+    <update id="updateVehSidAndPeriod">
+        UPDATE
+                loan_repayment_plan_details
+        SET
+                paymentMoney = #{paymentMoney},
+                paymentInterest = #{paymentInterest}
+        WHERE busVinSid = #{busVinSid}
+          AND period = #{period}
+    </update>
+
+    <select id="selVehSidAndPeriod"
+            resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanMoneyVo">
+        SELECT
+                sid,
+                IFNULL(paymentMoney, 0) AS paymentMoney,
+                IFNULL(paymentInterest, 0) AS paymentInterest
+        FROM
+                loan_repayment_plan_details
+        WHERE busVinSid = #{busVinSid}
+          AND period = #{period}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsRest.java

@@ -56,4 +56,18 @@ public class LoanRepaymentPlanDetailsRest implements LoanRepaymentPlanDetailsFei
     public ResultBean<LoanRepaymentPlanDetailsForOverDue> checkOverDue(String sid) {
         return loanRepaymentPlanDetailsService.checkOverDue(sid);
     }
+
+    @Override
+    public ResultBean<LoanRepaymentPlanMoneyVo> selVehSidAndPeriod(String busVinSid, String period) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanRepaymentPlanMoneyVo loanRepaymentPlanMoneyVo = loanRepaymentPlanDetailsService.selVehSidAndPeriod(busVinSid, period);
+        return rb.success().setData(loanRepaymentPlanMoneyVo);
+    }
+
+    @Override
+    public ResultBean updateVehSidAndPeriod(String busVinSid, String period, String paymentMoney, String paymentInterest) {
+        ResultBean rb = ResultBean.fireFail();
+        loanRepaymentPlanDetailsService.updateVehSidAndPeriod(busVinSid, period, paymentMoney, paymentInterest);
+        return rb.success();
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java

@@ -72,6 +72,7 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
     private LoanRepaymentHistoryService loanRepaymentHistoryService;
     @Autowired
     private LoanRepaymentScheduleService loanRepaymentScheduleService;
+
     @Transactional(rollbackFor = Exception.class)
     public ResultBean<String> savePlanDetails(LoanRepaymentPlanDetailsDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
@@ -184,4 +185,11 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
     }
 
 
+    public LoanRepaymentPlanMoneyVo selVehSidAndPeriod(String busVinSid, String period) {
+        return baseMapper.selVehSidAndPeriod(busVinSid, period);
+    }
+
+    public void updateVehSidAndPeriod(String busVinSid, String period, String paymentMoney, String paymentInterest) {
+        baseMapper.updateVehSidAndPeriod(busVinSid, period, paymentMoney, paymentInterest);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.java

@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
-import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApply;
-import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApplyDetailsVo;
-import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApplyVo;
-import com.yxt.anrui.riskcenter.api.loanreturninboundapply.ReturnInboundVo;
+import com.yxt.anrui.riskcenter.api.loanreturninboundapply.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -39,4 +36,6 @@ public interface LoanReturnInboundApplyMapper extends BaseMapper<LoanReturnInbou
     BusSalesOrder selectOrder(String busVinSid);
 
     int selectByBusVinSid(String busVinSid);
+
+    ReturnAppVo selectDetailsApp(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.xml

@@ -92,7 +92,7 @@
                bm.config         configName,
                la.custName       customerName,
                bo.customerSid,
-               bv.borrowerSid,
+               bv.borrowerSid    loanSid,
                la.borrName       loanName,
                la.loanContractNo,
                la.bankName,
@@ -157,11 +157,51 @@
     </select>
 
     <select id="selectByBusVinSid" resultType="int">
-        select ifnull(sum(a.vehcount),0) from (
-        select count(*) as vehcount from loan_return_veh_ledger where busVinSid = #{busVinSid}
-        union all
-        select count(*) as vehcount from loan_return_inbound_apply where busVinSid = #{busVinSid} and
-        LENGTH(nodeState)>0 and nodeState != '终止'
-        ) a
+        select ifnull(sum(a.vehcount), 0)
+        from (
+                 select count(*) as vehcount
+                 from loan_return_veh_ledger
+                 where busVinSid = #{busVinSid}
+                 union all
+                 select count(*) as vehcount
+                 from loan_return_inbound_apply
+                 where busVinSid = #{busVinSid}
+                   and LENGTH(nodeState) > 0
+                   and nodeState != '终止'
+             ) a
+    </select>
+
+    <select id="selectDetailsApp" resultType="com.yxt.anrui.riskcenter.api.loanreturninboundapply.ReturnAppVo">
+        select la.createDept,
+               la.createByName,
+               DATE_FORMAT(la.createTime, '%Y-%m-%d') as createDate,
+               la.vinNo,
+               la.vehMark,
+               la.firstDate,
+               la.modelSid,
+               la.modelName,
+               la.configName,
+               la.configSid,
+               la.tralier,
+               la.customerName,
+               la.loanName,
+               la.loanContractNo,
+               la.bankName,
+               la.bankContractNo,
+               la.inboundMoney,
+               la.locationName,
+               la.parkFees,
+               la.alRepaidMoney,
+               la.currentBeMoney,
+               la.wheFundOccMoney,
+               la.nper,
+               la.currentPeriod,
+               la.unexpiredMoney,
+               la.alRepaidMoneyConPeriod,
+               la.beOverdueMoneyAndPeriod,
+               la.files,
+               la.remarks
+        from loan_return_inbound_apply la
+        where sid = #{sid}
     </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java

@@ -726,7 +726,26 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
     }
 
     public ResultBean<ReturnAppVo> getDetailsApp(String sid) {
-        return null;
+        ResultBean<ReturnAppVo> rb = ResultBean.fireFail();
+        LoanReturnInboundApply loanReturnInboundApply = fetchBySid(sid);
+        if (loanReturnInboundApply == null) {
+            return rb.setMsg("该交回车辆入库申请不存在");
+        }
+        ReturnAppVo returnAppVo = baseMapper.selectDetailsApp(sid);
+        if ("是".equals(loanReturnInboundApply.getTralier())) {
+            LoanReturnInboundTrailer loanReturnInboundTrailer = loanReturnInboundTrailerService.selectByMainSid(sid);
+            returnAppVo.setVinNoTrailer(loanReturnInboundTrailer.getVinNo());
+            returnAppVo.setVehMarkTrailer(loanReturnInboundTrailer.getVehMark());
+            returnAppVo.setTrailerType(loanReturnInboundTrailer.getTrailerType());
+            returnAppVo.setInboundMoneyTrailer(String.valueOf(loanReturnInboundTrailer.getInboundMoney()));
+            returnAppVo.setRemarksTrailer(loanReturnInboundTrailer.getRemarks());
+        }
+        String files = loanReturnInboundApply.getFiles();
+        if (StringUtils.isNotBlank(files)) {
+            List<String> fileList = Arrays.asList(files.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
+            returnAppVo.setFilesList(fileList);
+        }
+        return rb.success().setData(returnAppVo);
     }
 
   /*  public ResultBean<List<ReturnInboundVo>> getInboundList(String useOrgSid) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturnvehledger/LoanReturnVehLedgerMapper.xml

@@ -22,14 +22,13 @@
                lv.vehModel,
                lv.customer,
                lv.borrowerName,
-               lv.overMoney,
-               lv.notBecomeDueMoney,
                lv.location,
                lv.disposal,
                lv.inboundMoney,
                DATE_FORMAT(lv.inboundDate, '%Y-%m-%d')  AS inboundDate,
                DATE_FORMAT(lv.outboundDate, '%Y-%m-%d') AS outboundDate,
-               lv.vehicleState
+               lv.stockState vehicleState,
+        lv.busSid
         from loan_return_veh_ledger lv
         <where>
             ${ew.sqlSegment}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturnvehledger/LoanReturnVehLedgerService.java

@@ -73,8 +73,8 @@ public class LoanReturnVehLedgerService extends MybatisBaseService<LoanReturnVeh
             loanReturnVehLedger.setBorrowerName(loanReturnInboundApply.getLoanName());
             loanReturnVehLedger.setBorrowerSid(loanReturnInboundApply.getLoanSid());
             loanReturnVehLedger.setLocation(loanReturnInboundApply.getLocationName());
-//            loanReturnVehLedger.setDisposal();
-//            loanReturnVehLedger.setDisposalKey();
+            loanReturnVehLedger.setDisposal(ReturnVehType.Disposal.WCZ.getRemarks());
+            loanReturnVehLedger.setDisposalKey(ReturnVehType.Disposal.WCZ.getCode());
             loanReturnVehLedger.setInboundMoney(loanReturnInboundApply.getInboundMoney());
             loanReturnVehLedger.setInboundDate(new Date());
             loanReturnVehLedger.setUseOrgSid(loanReturnInboundApply.getUseOrgSid());
@@ -84,7 +84,8 @@ public class LoanReturnVehLedgerService extends MybatisBaseService<LoanReturnVeh
             loanReturnVehLedger.setBusVinSid(loanReturnInboundApply.getBusVinSid());
             BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectBusVinSid(loanReturnVehLedger.getBusVinSid());
             loanReturnVehLedger.setSaleOrderSid(busSalesOrderVehicle.getSalesOrderSid());
-            loanReturnVehLedger.setVehicleState("库存");
+            loanReturnVehLedger.setStockState(ReturnVehType.ReturnVehicleState.KC.getRemarks());
+            loanReturnVehLedger.setStockStateKey(ReturnVehType.ReturnVehicleState.KC.getCode());
             baseMapper.insert(loanReturnVehLedger);
             if (loanReturnInboundTrailer != null) {
                 LoanReturnVehLedger loanReturnVehLedgerTrailer = new LoanReturnVehLedger();
@@ -97,18 +98,21 @@ public class LoanReturnVehLedgerService extends MybatisBaseService<LoanReturnVeh
                 loanReturnVehLedgerTrailer.setPSid(loanReturnVehLedger.getSid());
                 loanReturnVehLedgerTrailer.setCustomer(loanReturnInboundApply.getCustomerName());
                 loanReturnVehLedgerTrailer.setCustomerSid(loanReturnInboundApply.getCustomerSid());
-                loanReturnVehLedgerTrailer.setVehicleState("库存");
+                loanReturnVehLedgerTrailer.setStockState(ReturnVehType.ReturnVehicleState.KC.getRemarks());
+                loanReturnVehLedgerTrailer.setStockStateKey(ReturnVehType.ReturnVehicleState.KC.getCode());
                 loanReturnVehLedgerTrailer.setBorrowerSid(loanReturnInboundApply.getLoanSid());
                 loanReturnVehLedgerTrailer.setBorrowerName(loanReturnInboundApply.getLoanName());
-//                loanReturnVehLedgerTrailer.setDisposal();
-//                loanReturnVehLedgerTrailer.setDisposalKey();
+                loanReturnVehLedgerTrailer.setDisposal(ReturnVehType.Disposal.WCZ.getRemarks());
+                loanReturnVehLedgerTrailer.setDisposalKey(ReturnVehType.Disposal.WCZ.getCode());
                 loanReturnVehLedgerTrailer.setInboundMoney(loanReturnInboundApply.getInboundMoney());
                 loanReturnVehLedgerTrailer.setInboundDate(new Date());
                 loanReturnVehLedgerTrailer.setOrgSidPath(loanReturnInboundApply.getOrgSidPath());
                 loanReturnVehLedgerTrailer.setBusSid(businessSid);
+                loanReturnVehLedgerTrailer.setVehType("挂车");
+                loanReturnVehLedgerTrailer.setLocation(loanReturnVehLedger.getLocation());
+                loanReturnVehLedgerTrailer.setLocationSid(loanReturnVehLedger.getLocationSid());
                 baseMapper.insert(loanReturnVehLedgerTrailer);
             }
-
         }
 
         return rb.success();
@@ -159,9 +163,13 @@ public class LoanReturnVehLedgerService extends MybatisBaseService<LoanReturnVeh
                     apply(StringUtils.isNotBlank(query.getInboundDateEnd()), "date_format (lv.inboundDate,'%Y-%m-%d') <= date_format('" + query.getInboundDateEnd() + "','%Y-%m-%d')"
                     );
             //出库日期开始
-            qw.apply(StringUtils.isNotBlank(query.getInboundDateStart()), "date_format (lv.outboundDate,'%Y-%m-%d') >= date_format('" + query.getInboundDateStart() + "','%Y-%m-%d')").
-                    apply(StringUtils.isNotBlank(query.getInboundDateEnd()), "date_format (lv.outboundDate,'%Y-%m-%d') <= date_format('" + query.getInboundDateEnd() + "','%Y-%m-%d')"
+            qw.apply(StringUtils.isNotBlank(query.getOutboundDateStart()), "date_format (lv.outboundDate,'%Y-%m-%d') >= date_format('" + query.getOutboundDateStart() + "','%Y-%m-%d')").
+                    apply(StringUtils.isNotBlank(query.getOutboundDateEnd()), "date_format (lv.outboundDate,'%Y-%m-%d') <= date_format('" + query.getOutboundDateEnd() + "','%Y-%m-%d')"
                     );
+            //库存状态
+            if (StringUtils.isNotBlank(query.getVehicleStateKey())) {
+                qw.eq("lv.stockStateKey", query.getVehicleStateKey());
+            }
             //========================================数据授权开始
             if (StringUtils.isNotBlank(query.getMenuUrl())) {
                 //=======================
@@ -210,11 +218,14 @@ public class LoanReturnVehLedgerService extends MybatisBaseService<LoanReturnVeh
         paggingRecords.removeAll(Collections.singleton(null));
         if (!paggingRecords.isEmpty()) {
             for (LoanReturnVehLedgerVo record : pagging.getRecords()) {
-                AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr(record.getBusVinSid());
-                if (alrepaidAndArrVo != null) {
-                    record.setOverMoney(alrepaidAndArrVo.getCurrentBeMoney());
-                    record.setNotBecomeDueMoney(alrepaidAndArrVo.getUnexpiredMoney());
+                if ("主车".equals(record.getVehType())) {
+                    AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr(record.getBusVinSid());
+                    if (alrepaidAndArrVo != null) {
+                        record.setOverMoney(alrepaidAndArrVo.getCurrentBeMoney());
+                        record.setNotBecomeDueMoney(alrepaidAndArrVo.getUnexpiredMoney());
+                    }
                 }
+
             }
         }
         PagerVo<LoanReturnVehLedgerVo> p = PagerUtil.pageToVo(pagging, null);
@@ -237,7 +248,16 @@ public class LoanReturnVehLedgerService extends MybatisBaseService<LoanReturnVeh
         ResultBean<LoanReturnLedgerVo> rb = ResultBean.fireFail();
         LoanReturnVehLedger loanReturnVehLedger = fetchBySid(sid);
         LoanReturnLedgerVo loanReturnLedgerVo = new LoanReturnLedgerVo();
-        BeanUtil.copyProperties(loanReturnVehLedger,loanReturnLedgerVo);
+        BeanUtil.copyProperties(loanReturnVehLedger, loanReturnLedgerVo);
+        if ("主车".equals(loanReturnVehLedger.getVehType())) {
+            AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr(loanReturnVehLedger.getBusVinSid());
+            if (alrepaidAndArrVo != null) {
+                loanReturnLedgerVo.setOverMoney(alrepaidAndArrVo.getCurrentBeMoney());
+                loanReturnLedgerVo.setNotBecomeDueMoney(alrepaidAndArrVo.getUnexpiredMoney());
+            }
+        }
+        loanReturnLedgerVo.setVehicleState(loanReturnVehLedger.getStockState());
+        loanReturnLedgerVo.setVehicleStateKey(loanReturnVehLedger.getStockStateKey());
         return rb.success().setData(loanReturnLedgerVo);
     }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionRecordInit.java

@@ -60,5 +60,5 @@ public class AppBeCollectionRecordInit {
     private List<String> files = new ArrayList<>();
 
     @ApiModelProperty("协议书模板下载地址")
-    private String xysDownLoadUrl = "D:\\anrui\\upload\\template\\协议书模板.pdf";
+    private String xysDownLoadUrl;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/returninbound/ReturnInboundAppVo.java

@@ -1,7 +1,12 @@
 package com.yxt.anrui.terminal.api.risk.returninbound;
 
+import com.yxt.anrui.terminal.api.supplychain.vehicleApply.VehicleApplyCarPageVo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -9,4 +14,99 @@ import lombok.Data;
  **/
 @Data
 public class ReturnInboundAppVo {
+
+    private String publishInfo;
+
+    @ApiModelProperty("申请部门")
+    private String createDept;
+
+    @ApiModelProperty("申请人")
+    private String createByName;
+    @ApiModelProperty("发起日期")
+    private String createDate;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("首次登记日期")
+    private String firstDate;
+    @ApiModelProperty("车型名称")
+    private String modelName;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("配置sid")
+    private String configSid;
+    @ApiModelProperty("配置名称")
+    private String configName;
+    @ApiModelProperty("是否带挂车")
+    private String tralier;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    @ApiModelProperty("贷款人")
+    private String loanName;
+    @ApiModelProperty("贷款合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("资方")
+    private String bankName;
+    @ApiModelProperty("资方合同编号")
+    private String bankContractNo;
+    @ApiModelProperty("入库价")
+    private int inboundMoney;
+    @ApiModelProperty("停放地点")
+    private String locationName;
+
+    @ApiModelProperty("停车收费标准")
+    private String parkFees;
+    @ApiModelProperty("已还金额")
+    private String alRepaidMoney;
+    @ApiModelProperty("当前逾期金额/其中资金占用费")
+    private String yqzjzyMoney;
+    @ApiModelProperty("未到期金额")
+    private String unexpiredMoney;
+    @ApiModelProperty("总期数/当前期数")
+    private String qsCount;
+    @ApiModelProperty("已还金额换算期数")
+    private String alRepaidMoneyConPeriod;
+    @ApiModelProperty("逾期金额换算期数")
+    private String beOverdueMoneyAndPeriod;
+
+
+    private String remarks;
+
+    private List<String> filesList = new ArrayList<>();
+
+    @ApiModelProperty(value = "任务id")
+    private String taskId;
+    @ApiModelProperty(value = "流程实例id")
+    private String procInstId;
+
+
+    @ApiModelProperty("挂车车架号")
+    private String vinNoTrailer;
+    @ApiModelProperty("挂车车牌号")
+    private String vehMarkTrailer;
+    @ApiModelProperty("挂车类型")
+    private String trailerType;
+    @ApiModelProperty("挂车类型key")
+    private String trailerTypeKey;
+    @ApiModelProperty("挂车入库价")
+    private int inboundMoneyTrailer;
+    @ApiModelProperty("挂车备注")
+    private String remarksTrailer;
+
+    @ApiModelProperty("车型信息")
+    private VehicleApplyCarPageVo carDetailPage;
+
+    private String orgPath;
+
+    @ApiModelProperty("当前逾期金额")
+    private String currentBeMoney;
+    @ApiModelProperty("其中资金占用费")
+    private String wheFundOccMoney;
+    @ApiModelProperty("总期数")
+    private String nper;
+    @ApiModelProperty("当前期数")
+    private String currentPeriod;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java

@@ -66,6 +66,7 @@ import com.yxt.anrui.terminal.api.risk.becollection.flowable.*;
 import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppFinanceForm;
 import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppLoanHomeVisitVo;
 import com.yxt.anrui.terminal.biz.base.common.CommonService;
+import com.yxt.common.base.config.component.DocPdfComponent;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -108,6 +109,8 @@ public class BeCollectionService {
     private CommonService commonService;
     @Autowired
     private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
+    @Autowired
+    private DocPdfComponent docPdfComponent;
 
     public ResultBean agreeCreditInfo(CompleteBeCollectionDto dto) {
         ResultBean rb = ResultBean.fireFail();
@@ -531,6 +534,8 @@ public class BeCollectionService {
             appBeCollectionRecordVehInits.add(appBeCollectionRecordVehInit);
         }
         appBeCollectionRecordInit.setAppBeCollectionRecordVehInitList(appBeCollectionRecordVehInits);
+        String prefixTemplateUrl = docPdfComponent.getPrefixTemplateUrl();
+        appBeCollectionRecordInit.setXysDownLoadUrl(prefixTemplateUrl + "协议书模板.pdf");
         return rb.success().setData(appBeCollectionRecordInit);
     }
 

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/returninbound/ReturnInboundService.java

@@ -1,21 +1,32 @@
 package com.yxt.anrui.terminal.biz.risk.returninbound;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplyVo;
+import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo;
+import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign;
 import com.yxt.anrui.riskcenter.api.loanoverduefin.flowable.*;
 import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApply;
 import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApplyFeign;
+import com.yxt.anrui.riskcenter.api.loanreturninboundapply.ReturnAppVo;
 import com.yxt.anrui.riskcenter.api.loanreturninboundapply.flowable.*;
 import com.yxt.anrui.terminal.api.risk.returninbound.ReturnInboundAppVo;
 import com.yxt.anrui.terminal.api.risk.returninbound.flowable.ReturnInboundDelegateQuery;
 import com.yxt.anrui.terminal.api.risk.returninbound.flowable.ReturnInboundDto;
 import com.yxt.anrui.terminal.api.risk.returninbound.flowable.ReturnInboundQuery;
 import com.yxt.anrui.terminal.api.risk.returninbound.flowable.ReturnInboundTaskQuery;
+import com.yxt.anrui.terminal.api.supplychain.vehicleApply.VehicleApplyCarPageVo;
+import com.yxt.anrui.terminal.api.supplychain.vehicleApply.VehicleApplyListVo;
+import com.yxt.anrui.terminal.api.supplychain.vehicleApply.VehicleApplyVo;
 import com.yxt.common.core.result.ResultBean;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @description:
@@ -26,6 +37,8 @@ import java.util.List;
 public class ReturnInboundService {
     @Autowired
     private LoanReturnInboundApplyFeign loanReturnInboundApplyFeign;
+    @Autowired
+    private AppSubsetVersionFeign appSubsetVersionFeign;
 
     public ResultBean agreeReturnInbound(ReturnInboundDto dto) {
         ResultBean rb = ResultBean.fireFail();
@@ -101,7 +114,34 @@ public class ReturnInboundService {
     }
 
     public ResultBean<ReturnInboundAppVo> getReturnInbound(String sid) {
-        return null;
+        ResultBean<ReturnInboundAppVo> rb = ResultBean.fireFail();
+        ResultBean<ReturnAppVo> resultBean = loanReturnInboundApplyFeign.getDetailsApp(sid);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        ResultBean<AppSubVersionVo> voResultBean = appSubsetVersionFeign.selectLast();
+        AppSubVersionVo appSubVersionVo = voResultBean.getData();
+        ReturnInboundAppVo returnInboundAppVo = new ReturnInboundAppVo();
+        BeanUtil.copyProperties(resultBean.getData(), returnInboundAppVo);
+        VehicleApplyCarPageVo appVehicleVersionVo = new VehicleApplyCarPageVo();
+        String modelSid = returnInboundAppVo.getModelSid();
+        String configSid = returnInboundAppVo.getConfigSid();
+        Map<String, Object> map = new HashMap<>();
+        map.put("modelSid", modelSid);
+        map.put("configSid", configSid);
+        map.put("selectType", 0);
+        map.put("orgPath", returnInboundAppVo.getOrgPath());
+        appSubVersionVo.setJson(JSONObject.toJSONString(map));
+        BeanUtil.copyProperties(appSubVersionVo, appVehicleVersionVo);
+        returnInboundAppVo.setCarDetailPage(appVehicleVersionVo);
+        returnInboundAppVo.setPublishInfo(returnInboundAppVo.getCreateDept()+"-"+returnInboundAppVo.getCreateByName());
+        if (StringUtils.isNotBlank(returnInboundAppVo.getNper()) && StringUtils.isNotBlank(returnInboundAppVo.getCurrentPeriod())) {
+            returnInboundAppVo.setQsCount(returnInboundAppVo.getNper() + "/" + returnInboundAppVo.getCurrentPeriod());
+        }
+        if (StringUtils.isNotBlank(returnInboundAppVo.getCurrentBeMoney()) && StringUtils.isNotBlank(returnInboundAppVo.getWheFundOccMoney())) {
+            returnInboundAppVo.setYqzjzyMoney(returnInboundAppVo.getCurrentBeMoney() + "/" + returnInboundAppVo.getWheFundOccMoney());
+        }
+        return rb.success().setData(returnInboundAppVo);
     }
 
     public ResultBean delegate(ReturnInboundDelegateQuery delegateQuery) {

anrui-terminal/anrui-terminal-biz/src/main/resources/application-devv.yml

@@ -22,4 +22,7 @@ image:
     path: D:\anrui\upload\
   url:
     prefix: http://26077a35f5.wicp.vip/upload/
+templateUrl:
+  uploadUrl: D:\anrui\upload\template\
+  prefixUrl: http://192.168.0.116:8111/upload/template/
 

anrui-terminal/anrui-terminal-biz/src/main/resources/application-pro.yml

@@ -20,4 +20,7 @@ image:
     path: D:\anrui\upload\
   url:
     prefix: http://120.46.172.184/api/upload/
+templateUrl:
+  uploadUrl: D:\anrui\upload\template\
+  prefixUrl: http://120.46.172.184/api/upload/template/