移动端月还明细接口开发

垫款申请、催收申请列表降序优化
垫款申请审批通过推送出纳待付款

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java

@@ -205,6 +205,7 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
         if (StringUtils.isNotBlank(query.getCollMeasure())) {
             qw.like("collMeasure", query.getCollMeasure());
         }
+        qw.orderByDesc("createTime");
         IPage<LoanBeCollectionApply> page = PagerUtil.queryToPage(pq);
         IPage<LoanBeCollectionApplyVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<LoanBeCollectionApplyVo> p = PagerUtil.pageToVo(pagging, null);

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

@@ -33,6 +33,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
+import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply;
+import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyDto;
+import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyFeign;
+import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto;
+import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeign;
 import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
@@ -133,6 +138,8 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
     private FileUploadComponent fileUploadComponent;
     @Autowired
     private FlowFeign flowFeign;
+    @Autowired
+    private FinPaymentrecordFeign finPaymentrecordFeign;
 
     public PagerVo<LoanBePadsincereApplyVo> listPageVo(PagerQuery<LoanBePadsincereApplyQuery> pq) {
         LoanBePadsincereApplyQuery query = pq.getParams();
@@ -189,6 +196,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
         qw.apply(StringUtils.isNotBlank(query.getCreateStartTime()), "date_format (createTime,'%Y-%m-%d') >= date_format('" + query.getCreateStartTime() + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(query.getCreateEndTime()), "date_format (createTime,'%Y-%m-%d') <= date_format('" + query.getCreateEndTime() + "','%Y-%m-%d')"
                 );
+        qw.orderByDesc("createTime");
         IPage<LoanBePadsincereApply> page = PagerUtil.queryToPage(pq);
         IPage<LoanBePadsincereApplyVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<LoanBePadsincereApplyVo> p = PagerUtil.pageToVo(pagging, null);
@@ -816,6 +824,31 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+                FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
+                finPaymentrecordDto.setApplySid("");
+                finPaymentrecordDto.setPayCompanySid("");
+                finPaymentrecordDto.setPayType(0);
+                finPaymentrecordDto.setCreateOrgSid(loanBePadsincereApply.getUseOrgSid());
+                finPaymentrecordDto.setUseOrgSid(loanBePadsincereApply.getUseOrgSid());
+                finPaymentrecordDto.setCostTypeKey("");
+                finPaymentrecordDto.setCostTypeValue("");
+                finPaymentrecordDto.setCostTitleKey("");
+                finPaymentrecordDto.setCostTitleValue("");
+                finPaymentrecordDto.setReceiveBank("");
+                finPaymentrecordDto.setReceiveBankAccount("");
+                finPaymentrecordDto.setReceiveCompany("");
+                finPaymentrecordDto.setCost(0);
+                finPaymentrecordDto.setAccountsReceive(0);
+                finPaymentrecordDto.setBusSid("");
+                finPaymentrecordDto.setPayRemark(loanBePadsincereApply.getPaymentRemarks());
+                finPaymentrecordDto.setPayCode("");
+                finPaymentrecordDto.setCreateBySid(loanBePadsincereApply.getCreateBySid());
+                finPaymentrecordDto.setUpdateBySid(loanBePadsincereApply.getCreateBySid());
+                finPaymentrecordDto.setRemarks(loanBePadsincereApply.getRemarks());
+                finPaymentrecordDto.setPurchaseSystemSid("");
+                finPaymentrecordDto.setPurchaseSystemName("");
+                finPaymentrecordDto.setBusRemarks(loanBePadsincereApply.getPaymentRemarks());
+                finPaymentrecordFeign.save(finPaymentrecordDto);
             } else {
                 //极光推送
                 loanBePadsincereApply = fetchBySid(businessSid);

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

@@ -0,0 +1,37 @@
+package com.yxt.anrui.terminal.api.risk.becollection;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/16 14:34
+ */
+@Data
+public class AppMonRepayDetails extends BaseEntity {
+
+    @ApiModelProperty("分公司")
+    private String useOrgName;
+    @ApiModelProperty("销售部门")
+    private String dept;
+    @ApiModelProperty("销售专员")
+    private String staffName;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("消贷合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("资方名称")
+    private String bankName;
+    @ApiModelProperty("资方合同")
+    private String bankContractNo;
+    @ApiModelProperty("客户")
+    private String customer;
+    @ApiModelProperty("借款人名称")
+    private String borrowerName;
+    @ApiModelProperty("期数明细")
+    private List<AppMonRepayPeriodDetails> appMonRepayPeriodDetailsList;
+}

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

@@ -0,0 +1,25 @@
+package com.yxt.anrui.terminal.api.risk.becollection;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/16 14:34
+ */
+@Data
+public class AppMonRepayPeriodDetails extends BaseEntity {
+
+    @ApiModelProperty("期数")
+    private String period;
+    @ApiModelProperty("应还金额")
+    private BigDecimal dueMoney;
+    @ApiModelProperty("实收金额")
+    private BigDecimal receiptMoney;
+    @ApiModelProperty("未还金额")
+    private BigDecimal notRepaidMoney;
+}

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

@@ -60,6 +60,10 @@ public interface BeCollectionFeign {
     @ResponseBody
     public ResultBean<AppDbrDetailsVo> showDbr(@RequestParam("saleVehSid") String saleVehSid);
 
+    @ApiOperation("月还明细")
+    @GetMapping("/yhmxDetails")
+    public ResultBean<AppMonRepayDetails> yhmxDetails(@RequestParam("saleVehSid") String saleVehSid);
+
     /****************************************催收流程审批******************************************/
 
     @ApiOperation("办理")

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

@@ -81,6 +81,11 @@ public class BeCollectionRest implements BeCollectionFeign {
         return beCollectionService.showDbr(saleVehSid);
     }
 
+    @Override
+    public ResultBean<AppMonRepayDetails> yhmxDetails(String saleVehSid) {
+        return beCollectionService.yhmxDetails(saleVehSid);
+    }
+
     @Override
     public ResultBean agreeCreditInfo(CompleteBeCollectionDto dto) {
         return beCollectionService.agreeCreditInfo(dto);

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

@@ -53,6 +53,9 @@ import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.LoanBePadsincereApplyF
 import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.LoanBePadsincereFile;
 import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.flowable.*;
 import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsFeign;
+import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.MonRepayDetails;
+import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.MonRepayPeriodDetails;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
 import com.yxt.anrui.terminal.api.base.common.CarModelVo;
@@ -91,6 +94,8 @@ public class BeCollectionService {
     @Autowired
     private LoanBeCollectionVehFeign loanBeCollectionVehFeign;
     @Autowired
+    private LoanRepaymentPlanDetailsFeign loanRepaymentPlanDetailsFeign;
+    @Autowired
     private SysUserFeign sysUserFeign;
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
@@ -580,4 +585,20 @@ public class BeCollectionService {
         appDbrDetailsVo.setAppqt(appqt);
         return rb.success().setData(appDbrDetailsVo);
     }
+
+    public ResultBean<AppMonRepayDetails> yhmxDetails(String saleVehSid) {
+        ResultBean rb = ResultBean.fireFail();
+        AppMonRepayDetails appMonRepayDetails = new AppMonRepayDetails();
+        MonRepayDetails monRepayDetails = loanRepaymentPlanDetailsFeign.details(saleVehSid).getData();
+        BeanUtil.copyProperties(monRepayDetails,appMonRepayDetails);
+        List<MonRepayPeriodDetails> monRepayPeriodDetailsList = monRepayDetails.getMonRepayPeriodDetailsList();
+        List<AppMonRepayPeriodDetails> appMonRepayPeriodDetailsList = new ArrayList<>();
+        for (MonRepayPeriodDetails monRepayPeriodDetails : monRepayPeriodDetailsList) {
+            AppMonRepayPeriodDetails appMonRepayPeriodDetails = new AppMonRepayPeriodDetails();
+            BeanUtil.copyProperties(monRepayPeriodDetails,appMonRepayPeriodDetails);
+            appMonRepayPeriodDetailsList.add(appMonRepayPeriodDetails);
+        }
+        appMonRepayDetails.setAppMonRepayPeriodDetailsList(appMonRepayPeriodDetailsList);
+        return rb.success().setData(appMonRepayDetails);
+    }
 }