Merge remote-tracking branch 'origin/master'

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

@@ -74,6 +74,7 @@ public class LoanRepaymentPlanDetails extends BaseEntity {
     private String returnWay;
     private String actualPerson; //实际还款人
     private BigDecimal paymentMoney; //公司垫款金额
+    private BigDecimal paymentInterest; //垫资方逾期利息
     private BigDecimal fund; //资金占用费
     private Integer overdue; //是否曾逾期（0是，1否）
     private Integer oweState; //是否转累欠状态（0是，1否）

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

@@ -0,0 +1,83 @@
+package com.yxt.anrui.riskcenter.api.loanreturnvehledger;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/23
+ **/
+@Data
+public class LoanReturnLedgerVo {
+
+    private String sid;
+
+    @ApiModelProperty("车辆sid")
+    private String vinSid;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车牌号")
+    private String vehMark;
+    @ApiModelProperty("车辆类型")
+    private String vehType;
+    @ApiModelProperty("车辆类型key")
+    private String vehTypeKey;
+    @ApiModelProperty("车型")
+    private String vehModel;
+    @ApiModelProperty("车型sid")
+    private String vehModelSid;
+    @ApiModelProperty("配置sid")
+    private String configSid;
+    @ApiModelProperty("配置")
+    private String configName;
+    @ApiModelProperty("客户名称")
+    private String customer;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("贷款人")
+    private String borrowerName;
+    @ApiModelProperty("贷款人sid")
+    private String borrowerSid;
+    @ApiModelProperty("存放地点")
+    private String location;
+    @ApiModelProperty("存放地点sid")
+    private String locationSid;
+    @ApiModelProperty("处置方式key")
+    private String disposalKey;
+    @ApiModelProperty("处置方式")
+    private String disposal;
+    @ApiModelProperty("入库价")
+    private int inboundMoney;
+    @ApiModelProperty("入库日期")
+    private Date inboundDate;
+    @ApiModelProperty("出库日期")
+    private Date outboundDate;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+    @ApiModelProperty("组织全路径")
+    private String orgSidPath;
+    @ApiModelProperty("逾期金额")
+    private String overMoney;
+    @ApiModelProperty("未到期金额")
+    private String notBecomeDueMoney;
+    @JsonProperty("pSid")
+    private String pSid;
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
+    @ApiModelProperty("销售订单车辆sid")
+    private String busVinSid;
+    @ApiModelProperty("库存状态")
+    private String vehicleState;
+    @ApiModelProperty("库存状态key")
+    private String vehicleStateKey;
+    @ApiModelProperty("业务sid")
+    private String busSid;
+
+}

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

@@ -75,6 +75,8 @@ public class LoanReturnVehLedger extends BaseEntity {
     private String vehicleState;
     @ApiModelProperty("库存状态key")
     private String vehicleStateKey;
+    @ApiModelProperty("业务sid")
+    private String busSid;
 
 
 }

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

@@ -62,4 +62,5 @@ public class LoanReturnVehLedgerDto {
     @ApiModelProperty("库存状态key")
     private String vehicleStateKey;
 
+
 }

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

@@ -5,8 +5,10 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * @description:
@@ -28,5 +30,9 @@ public interface LoanReturnVehLedgerFeign {
     @PostMapping("/update")
     ResultBean update(@RequestBody LoanReturnVehLedgerDto dto);
 
+    @ApiOperation("详情")
+    @GetMapping("/details")
+    ResultBean<LoanReturnLedgerVo> getDetails(@RequestParam("sid") String sid);
+
 
 }

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

@@ -12,6 +12,8 @@ import lombok.Data;
 public class LoanReturnVehLedgerVo {
 
     private String sid;
+    @ApiModelProperty("入库申请的sid")
+    private String busSid;
 
     @ApiModelProperty("分公司")
     private String useOrgName;
@@ -44,4 +46,8 @@ public class LoanReturnVehLedgerVo {
     @ApiModelProperty("库存状态")
     private String vehicleState;
 
+    private String busVinSid;
+
+    private String pSid;
+
 }

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

@@ -34,4 +34,9 @@ public class LoanReturnVehLedgerRest implements LoanReturnVehLedgerFeign {
     public ResultBean update(LoanReturnVehLedgerDto dto) {
         return loanReturnVehLedgerService.updateDto(dto);
     }
+
+    @Override
+    public ResultBean<LoanReturnLedgerVo> getDetails(String sid) {
+        return loanReturnVehLedgerService.getDetails(sid);
+    }
 }

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

@@ -6,14 +6,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo;
 import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApply;
 import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApplyQuery;
 import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApplyVo;
 import com.yxt.anrui.riskcenter.api.loanreturninboundtrailer.LoanReturnInboundTrailer;
-import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger;
-import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedgerDto;
-import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedgerQuery;
-import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedgerVo;
+import com.yxt.anrui.riskcenter.api.loanreturnvehledger.*;
+import com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService;
 import com.yxt.anrui.riskcenter.biz.loanreturninboundapply.LoanReturnInboundApplyService;
 import com.yxt.anrui.riskcenter.biz.loanreturninboundtrailer.LoanReturnInboundTrailerService;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -44,6 +43,8 @@ public class LoanReturnVehLedgerService extends MybatisBaseService<LoanReturnVeh
     private LoanReturnInboundTrailerService loanReturnInboundTrailerService;
     @Autowired
     private SysUserFeign sysUserFeign;
+    @Autowired
+    private LoanRestoreReportApplyService loanRestoreReportApplyService;
 
     public ResultBean saveVehLedger(String businessSid) {
         ResultBean rb = ResultBean.fireFail();
@@ -58,6 +59,7 @@ public class LoanReturnVehLedgerService extends MybatisBaseService<LoanReturnVeh
         LoanReturnVehLedger loanReturnVehLedger = baseMapper.selectByBusVinSid(loanReturnInboundApply.getBusVinSid());
         if (loanReturnVehLedger == null) {
             loanReturnVehLedger = new LoanReturnVehLedger();
+            loanReturnVehLedger.setBusSid(businessSid);
             loanReturnVehLedger.setVinSid(loanReturnInboundApply.getVinSid());
             loanReturnVehLedger.setVinNo(loanReturnInboundApply.getVinNo());
             loanReturnVehLedger.setVehMark(loanReturnInboundApply.getVehMark());
@@ -103,6 +105,7 @@ public class LoanReturnVehLedgerService extends MybatisBaseService<LoanReturnVeh
                 loanReturnVehLedgerTrailer.setInboundMoney(loanReturnInboundApply.getInboundMoney());
                 loanReturnVehLedgerTrailer.setInboundDate(new Date());
                 loanReturnVehLedgerTrailer.setOrgSidPath(loanReturnInboundApply.getOrgSidPath());
+                loanReturnVehLedgerTrailer.setBusSid(businessSid);
                 baseMapper.insert(loanReturnVehLedgerTrailer);
             }
 
@@ -203,6 +206,17 @@ public class LoanReturnVehLedgerService extends MybatisBaseService<LoanReturnVeh
         qw.orderByDesc("lv.createTime");
         IPage<LoanReturnVehLedger> page = PagerUtil.queryToPage(pagerQuery);
         IPage<LoanReturnVehLedgerVo> pagging = baseMapper.selectPageVo(page, qw);
+        List<LoanReturnVehLedgerVo> paggingRecords = pagging.getRecords();
+        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());
+                }
+            }
+        }
         PagerVo<LoanReturnVehLedgerVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -218,4 +232,12 @@ public class LoanReturnVehLedgerService extends MybatisBaseService<LoanReturnVeh
         baseMapper.updateById(loanReturnVehLedger);
         return rb.success();
     }
+
+    public ResultBean<LoanReturnLedgerVo> getDetails(String sid) {
+        ResultBean<LoanReturnLedgerVo> rb = ResultBean.fireFail();
+        LoanReturnVehLedger loanReturnVehLedger = fetchBySid(sid);
+        LoanReturnLedgerVo loanReturnLedgerVo = new LoanReturnLedgerVo();
+        BeanUtil.copyProperties(loanReturnVehLedger,loanReturnLedgerVo);
+        return rb.success().setData(loanReturnLedgerVo);
+    }
 }