Merge remote-tracking branch 'origin/master'

anrui-riskcenter-ui/src/api/monthlypayment/monthlypayment.js

@@ -22,8 +22,7 @@ export default {
     return request({
       url: '/riskcenter/v1/loanrepaymenthistory/updateState',
       method: 'post',
-      data: data,
+      params: data
-      headers: { 'Content-Type': 'application/json' }
     })
   },
   deleteBySids: function(data) {

anrui-riskcenter-ui/src/router/index.js

@@ -352,14 +352,14 @@ export const constantRoutes = [
     component: Layout,
     redirect: '/monthlypayment',
     meta: {
-      title: '当月还款记录'
+      title: '待划扣还款记录'
     },
     children: [
       {
         path: '/monthlypayment/monthlypayment',
         component: () => import('@/views/monthlypayment/monthlypayment.vue'),
         name: 'MonthlyPayment',
-        meta: { title: '当月还款记录', noCache: true }
+        meta: { title: '待划扣还款记录', noCache: true }
       }
     ]
   },

anrui-riskcenter-ui/src/views/monthlypayment/adjust.vue

@@ -66,11 +66,7 @@
         <el-row>
           <el-col :span="24">
             <div class="span-sty colSty">还款方式</div>
-            <el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.returnWay }}</span></el-form-item>
-              <el-select class="addinputInfo" v-model="formobj.returnWayKey" placeholder="请选择" clearable filterable @change="returnWayChange">
-                <el-option v-for="item in repaymentWay_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
-              </el-select>
-            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -118,11 +114,6 @@ export default {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
-      typeValues({ type: 'repaymentWay' }).then((resp) => {
-        if (resp.success) {
-          this.repaymentWay_list = resp.data
-        }
-      })
       req.fetchBySid({ sid: sid }).then((res) => {
         if (res.success) {
           this.formobj = res.data
@@ -137,14 +128,6 @@ export default {
         e.target.value = parseFloat(e.target.value)
       }
     },
-    returnWayChange(value) {
-      const choose = this.repaymentWay_list.filter((item) => item.dictKey === value)
-      if (choose.length > 0 && choose !== null) {
-        this.formobj.returnWay = choose[0].dictValue
-      } else {
-        this.formobj.returnWay = ''
-      }
-    },
     save() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {

anrui-riskcenter-ui/src/views/monthlypayment/monthlypayment.vue

@@ -86,8 +86,8 @@
             <el-table-column prop="actualDate" label="实还日期" align="center" width="140"/>
             <el-table-column prop="actualMoney" label="实还金额" align="center" width="140"/>
             <el-table-column prop="dataTime" label="数据日期" align="center" width="140"/>
-            <el-table-column prop="dataTime" label="更新日期" align="center" width="120"/>
+            <el-table-column prop="updateTime" label="更新日期" align="center" width="120"/>
-            <el-table-column prop="dataTime" label="更新状态" align="center" width="120"/>
+            <el-table-column prop="updateState" label="更新状态" align="center" width="120"/>
             <el-table-column prop="buckle" label="划扣状态" align="center" width="140"/>
           </el-table>
         </div>

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleApplyFeignFallback.java

@@ -25,6 +25,7 @@ public class LoanBuckleApplyFeignFallback implements LoanBuckleApplyFeign {
         return null;
     }
 
+
     @Override
     public ResultBean<String> saveBuckle(LoanBuckleApplyDto dto) {
         return null;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistory.java

@@ -28,8 +28,6 @@ public class LoanRepaymentHistory extends BaseEntity {
     private Date dataTime;
     @ApiModelProperty("实还金额")
     private BigDecimal actualMoney;
-//    @ApiModelProperty("本期未还金额")
-//    private BigDecimal outstandingMoney;
     @ApiModelProperty("划扣状态key")
     private String buckleKey;
     @ApiModelProperty("划扣状态")
@@ -38,6 +36,18 @@ public class LoanRepaymentHistory extends BaseEntity {
     private String returnWay;
     @ApiModelProperty("还款方式key")
     private String returnWayKey;
-    @ApiModelProperty("办结日期")
+    @ApiModelProperty("划扣通过日期")
     private Date closingDate;
+    @ApiModelProperty("实际转付日期")
+    private Date transferDate;
+    @ApiModelProperty("预转付日期")
+    private Date prepareDate;
+    @ApiModelProperty("转付状态key")
+    private String paymentStateKey;
+    @ApiModelProperty("转付状态")
+    private String paymentState;
+    @ApiModelProperty("更新状态")
+    private String updateState;
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistoryFeign.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.riskcenter.api.loanrepaymenthistory;
 
+import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApplyInit;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterQuery;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo;
 import com.yxt.common.core.query.PagerQuery;
@@ -73,8 +74,24 @@ public interface LoanRepaymentHistoryFeign {
     @ResponseBody
     public ResultBean deleteBySids(@RequestBody String[] sids);
 
+    @ApiOperation("更新")
+    @PostMapping("/updateState")
+    @ResponseBody
+    public ResultBean updateState(@RequestParam("orgPath") String orgPath);
+
+    @ApiOperation("划扣申请初始化")
+    @GetMapping("/buckleNewInit")
+    @ResponseBody
+    public ResultBean<LoanBuckleApplyInit> buckleNewInit(@RequestParam("orgPath") String orgPath);
+
 
     @ApiOperation(value = "下载模板")
     @PostMapping("/downloadExcel")
     public void downloadExcel();
+
+    @ApiOperation("间还转付记录列表")
+    @PostMapping("/transferPaymentList")
+    public ResultBean<PagerVo<TransferPaymentVo>> transferPaymentList(@RequestBody PagerQuery<TransferPaymentQuery> pq);
+
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistoryFeignFallback.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.riskcenter.api.loanrepaymenthistory;
 
+import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApplyInit;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -65,9 +66,24 @@ public class LoanRepaymentHistoryFeignFallback implements LoanRepaymentHistoryFe
         return null;
     }
 
+    @Override
+    public ResultBean updateState(String orgPath) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<LoanBuckleApplyInit> buckleNewInit(String orgPath) {
+        return null;
+    }
+
 
     @Override
     public void downloadExcel() {
 
     }
+
+    @Override
+    public ResultBean<PagerVo<TransferPaymentVo>> transferPaymentList(PagerQuery<TransferPaymentQuery> pq) {
+        return null;
+    }
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistoryVo.java

@@ -47,5 +47,6 @@ public class LoanRepaymentHistoryVo implements Vo {
     @ApiModelProperty("还款方式")
     private String returnWay;
     private String planDetailSid;
-
+    private String updateState; //更新状态
+    private String updateTime; //更新日期
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/TransferPaymentQuery.java

@@ -0,0 +1,35 @@
+package com.yxt.anrui.riskcenter.api.loanrepaymenthistory;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2023/12/5 8:41
+ */
+@Data
+public class TransferPaymentQuery implements Query {
+
+    private String vinNo; //车架号
+    private String bankName; //资方
+    private String bankContractNo; //资方合同号
+    @ApiModelProperty("应还开始日期")
+    private String dueStartDate;
+    @ApiModelProperty("应还结束日期")
+    private String dueEndDate;
+    private String accountTypeKey; //转付账户类型key
+    private String prepareStartDate; //预转付开始日期
+    private String prepareEndDate; //预转付结束日期
+    private String overdueState; //转付状态
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
+    @ApiModelProperty("菜单sid")
+    private String menuSid;
+    @ApiModelProperty("菜单url")
+    private String menuUrl;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    private String type; //0待转付 1已转付
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/TransferPaymentVo.java

@@ -0,0 +1,32 @@
+package com.yxt.anrui.riskcenter.api.loanrepaymenthistory;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2023/12/5 8:40
+ */
+@Data
+public class TransferPaymentVo implements Vo {
+
+    private String paymentState; //转付状态
+    private String vinNo; //车架号
+    private String loanContractNo; //贷款合同号
+    private String bankName; //资方
+    private String bankContractNo; //资方合同号
+    private String borrowerName; //贷款人
+    private String period; //期数
+    private String dueDate; //应还日期
+    private String dueMoney; //实还金额
+    private String prepareDate; //预转付日期
+    private String spread; //息差
+    private String transferPrincipal; //转付本金
+    private String defaultInterest; //转付罚息
+    private String accountType; //转付账户类型
+    private String account; //转付账户
+    private String accountNumber; //转付账户账号
+
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApply.java

@@ -0,0 +1,49 @@
+package com.yxt.anrui.riskcenter.api.loantransferpaymentapply;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "代收代付申请", description = "代收代付申请")
+@TableName("loan_transfer_payment_apply")
+@Data
+public class LoanTransferPaymentApply extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("申请人")
+    private String applyName; // 申请人
+    @ApiModelProperty("申请日期")
+    private Date applyDate; // 申请日期
+    @ApiModelProperty("申请编号")
+    private String billNo;
+    @ApiModelProperty("申请部门")
+    private String dept;
+    @ApiModelProperty("申请部门sid")
+    private String deptSid;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+    @ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+    @ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+    @ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+    @ApiModelProperty("taskId")
+    private String taskId; // taskId
+    @ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyDto.java

@@ -0,0 +1,27 @@
+package com.yxt.anrui.riskcenter.api.loantransferpaymentapply;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/11/13 14:11
+ */
+@Data
+public class LoanTransferPaymentApplyDto implements Dto {
+
+    private String sid;
+    private String userSid;
+    private String dept;
+    private String deptSid;
+    private String applyName;
+    private String applyDate;
+    private String remarks;
+    private String orgPath;
+    private List<LoanTransferPaymentApplyFile> files = new ArrayList<>();
+    private List<LoanTransferPaymentRecordVo> records = new ArrayList<>();
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeign.java

@@ -0,0 +1,35 @@
+package com.yxt.anrui.riskcenter.api.loantransferpaymentapply;
+
+import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppBuckleDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanbuckleapply.flow.*;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+
+/**
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "代收代付申请")
+@FeignClient(
+        contextId = "anrui-riskcenter-LoanTransferPaymentApply",
+        name = "anrui-riskcenter",
+        path = "v1/loantransferpaymentapply",
+        fallback = LoanTransferPaymentApplyFeignFallback.class)
+public interface LoanTransferPaymentApplyFeign {
+
+
+
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeignFallback.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.riskcenter.api.loantransferpaymentapply;
+
+
+import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppBuckleDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanbuckleapply.flow.*;
+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;
+
+
+@Component
+public class LoanTransferPaymentApplyFeignFallback implements LoanTransferPaymentApplyFeign {
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFile.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.riskcenter.api.loantransferpaymentapply;
+
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/11/17 9:18
+ */
+@Data
+public class LoanTransferPaymentApplyFile {
+    private String filePath;
+    private String name;
+    private String size;
+    private String status;
+    private String uid;
+    private String url;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyInit.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.riskcenter.api.loantransferpaymentapply;
+
+import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleHistoryRecord;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/11/13 13:43
+ */
+@Data
+public class LoanTransferPaymentApplyInit implements Vo {
+
+    private String sid;
+    private String userSid;
+    private String dept;
+    private String deptSid;
+    private String applyName;
+    private String applyDate;
+    private String remarks;
+    private String orgPath;
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("实例id")
+    private String instanceId;
+    private List<LoanTransferPaymentApplyFile> files = new ArrayList<>();
+    private List<LoanTransferPaymentRecordVo> records = new ArrayList<>();
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyQuery.java

@@ -0,0 +1,31 @@
+package com.yxt.anrui.riskcenter.api.loantransferpaymentapply;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/11/13 13:32
+ */
+@Data
+public class LoanTransferPaymentApplyQuery implements Query {
+
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
+    @ApiModelProperty("菜单sid")
+    private String menuSid;
+    @ApiModelProperty("菜单url")
+    private String menuUrl;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("分公司")
+    private String company; // 使用组织名称
+    @ApiModelProperty("申请人")
+    private String applyName; // 申请人
+    private String billNo;
+    private String applyStartDate;
+    private String applyEndDate;
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyVo.java

@@ -0,0 +1,36 @@
+package com.yxt.anrui.riskcenter.api.loantransferpaymentapply;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/11/13 13:32
+ */
+@Data
+public class LoanTransferPaymentApplyVo implements Vo {
+
+    private String sid;
+    @ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+    @ApiModelProperty("分公司")
+    private String company; // 使用组织名称
+    @ApiModelProperty("申请人")
+    private String applyName; // 申请人
+    @ApiModelProperty("申请部门")
+    private String dept;
+    @ApiModelProperty("申请日期")
+    private String applyDate; // 申请日期
+    @ApiModelProperty("申请编号")
+    private String billNo;
+    @ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
+
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentRecordVo.java

@@ -0,0 +1,13 @@
+package com.yxt.anrui.riskcenter.api.loantransferpaymentapply;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2023/12/6 10:21
+ */
+@Data
+public class LoanTransferPaymentRecordVo {
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentrecord/LoanTransferPaymentRecord.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.riskcenter.api.loantransferpaymentrecord;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "代收代付申请记录", description = "代收代付申请记录")
+@TableName("loan_transfer_payment_record")
+@Data
+public class LoanTransferPaymentRecord extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("申请表sid")
+    private String mainSid;
+    @ApiModelProperty("还款记录sid")
+    private String repaymentHistorySid;
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentrecord/LoanTransferPaymentRecordFeign.java

@@ -0,0 +1,22 @@
+package com.yxt.anrui.riskcenter.api.loantransferpaymentrecord;
+
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+
+/**
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "代收代付记录")
+@FeignClient(
+        contextId = "anrui-riskcenter-LoanTransferPaymentRecord",
+        name = "anrui-riskcenter",
+        path = "v1/loantransferpaymentrecord",
+        fallback = LoanTransferPaymentRecordFeignFallback.class)
+public interface LoanTransferPaymentRecordFeign {
+
+
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentrecord/LoanTransferPaymentRecordFeignFallback.java

@@ -0,0 +1,11 @@
+package com.yxt.anrui.riskcenter.api.loantransferpaymentrecord;
+
+
+import org.springframework.stereotype.Component;
+
+
+@Component
+public class LoanTransferPaymentRecordFeignFallback implements LoanTransferPaymentRecordFeign {
+
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyRest.java

@@ -39,6 +39,8 @@ public class LoanBuckleApplyRest implements LoanBuckleApplyFeign {
         return loanBuckleApplyService.buckleInit(sids);
     }
 
+
+
     @Override
     public ResultBean<String> saveBuckle(LoanBuckleApplyDto dto) {
         return loanBuckleApplyService.saveBuckle(dto);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java

@@ -174,6 +174,9 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
         return rb.success().setData(vo);
     }
 
+
+
+
     /**
      * 生成申请单单据编号
      *
@@ -909,4 +912,6 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
         }
         return ResultBean.fireSuccess().setMsg("删除成功");
     }
+
+
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java

@@ -267,7 +267,7 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
             }
 
         }
-        if("不通过".equals(dto.getCreditReview()) || "不通过".equals(dto.getHomeVisit()) || "不通过".equals(dto.getLoanReview())){
+        if("未通过".equals(dto.getCreditReview()) || "未通过".equals(dto.getHomeVisit()) || "未通过".equals(dto.getLoanReview())){
             //更新贷款人为作废
             baseMapper.updateByBorrow(borrowerSid);
         }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java

@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
+import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.*;
-import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistoryRecordVo;
-import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistoryUpdate;
-import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistoryVo;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -37,4 +34,11 @@ public interface LoanRepaymentHistoryMapper extends BaseMapper<LoanRepaymentHist
     LoanRepaymentHistoryRecordVo buckleInfo(String sid);
 
     List<LoanRepaymentHistory> selByPlanSid(@Param("planSid") String planDetailSid);
+
+    List<String> selUpdateStateList(@Param(Constants.WRAPPER) QueryWrapper<LoanRepaymentHistory> qw);
+
+
+    List<LoanRepaymentHistoryVo> selbuckleNewInitList(@Param(Constants.WRAPPER) QueryWrapper<LoanRepaymentHistory> qw);
+
+    IPage<TransferPaymentVo> transferPaymentList(IPage<LoanRepaymentHistory> page, @Param(Constants.WRAPPER) QueryWrapper<LoanRepaymentHistory> qw);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml

@@ -54,7 +54,12 @@
         h.actualMoney,
         h.buckle,
         h.returnWay,
-        h.planDetailSid
+        h.planDetailSid,
+        CASE h.updateState
+        WHEN '0' THEN '未更新'
+        WHEN '1' THEN '已更新'
+        END AS updateState,
+        date_format(h.updateTime, '%Y-%m-%d') as updateTime
         FROM
         loan_repayment_history AS h
         LEFT JOIN loan_repayment_plan_details AS p ON h.planDetailSid = p.sid
@@ -72,20 +77,20 @@
     </select>
     <select id="buckleInfo"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistoryRecordVo">
-        SELECT p.loanContractNo   as loanContractNo,
+        SELECT p.loanContractNo as loanContractNo,
-               p.bankName         as bankName,
+               p.bankName       as bankName,
-               p.bankContractNo   as bankContractNo,
+               p.bankContractNo as bankContractNo,
-               p.borrowerName     as borrowerName,
+               p.borrowerName   as borrowerName,
-               p.customer         as customer,
+               p.customer       as customer,
-               p.period           as period,
+               p.period         as period,
-               p.dueDate          as dueDate,
+               p.dueDate        as dueDate,
-               p.vinNo            as vinNo,
+               p.vinNo          as vinNo,
-               p.dueMoney         as dueMoney,
+               p.dueMoney       as dueMoney,
-               h.returnWay        as returnWay,
+               h.returnWay      as returnWay,
-               h.returnWayKey     as returnWayKey,
+               h.returnWayKey   as returnWayKey,
-               h.actualMoney      as actualMoney,
+               h.actualMoney    as actualMoney,
-               h.sid              as recordSid,
+               h.sid            as recordSid,
-               h.actualDate       as actualDate
+               h.actualDate     as actualDate
         FROM loan_repayment_history AS h
                  LEFT JOIN loan_repayment_plan_details AS p ON h.planDetailSid = p.sid
         WHERE h.sid = #{sid}
@@ -96,4 +101,45 @@
         from loan_repayment_history
         where planDetailSid = #{planSid}
     </select>
+    <select id="selUpdateStateList" resultType="java.lang.String">
+        SELECT
+        h.sid
+        FROM
+        loan_repayment_history AS h
+        LEFT JOIN loan_repayment_plan_details AS p ON h.planDetailSid = p.sid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="selbuckleNewInitList"
+            resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistoryVo">
+        SELECT
+        h.sid,
+        p.loanContractNo,
+        p.vinNo,
+        p.bankContractNo,
+        p.bankName,
+        p.customer,
+        p.period,
+        p.borrowerName,
+        p.dueDate,
+        p.dueMoney,
+        h.actualDate,
+        date_format(h.dataTime, '%Y-%m-%d') as dataTime,
+        h.actualMoney,
+        h.buckle,
+        h.returnWay,
+        h.planDetailSid
+        FROM
+        loan_repayment_history AS h
+        LEFT JOIN loan_repayment_plan_details AS p ON h.planDetailSid = p.sid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="transferPaymentList"
+            resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.TransferPaymentVo">
+
+    </select>
+
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryRest.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.riskcenter.biz.loanrepaymenthistory;
 
 
+import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApplyInit;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo;
 import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.*;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsDto;
@@ -86,6 +87,16 @@ public class LoanRepaymentHistoryRest implements LoanRepaymentHistoryFeign {
         return loanRepaymentHistoryService.deleteBySids(sids);
     }
 
+    @Override
+    public ResultBean updateState(String orgPath) {
+        return loanRepaymentHistoryService.updateState(orgPath);
+    }
+
+    @Override
+    public ResultBean<LoanBuckleApplyInit> buckleNewInit(String orgPath) {
+        return loanRepaymentHistoryService.buckleNewInit(orgPath);
+    }
+
     @Override
     public void downloadExcel() {
         try {
@@ -112,4 +123,11 @@ public class LoanRepaymentHistoryRest implements LoanRepaymentHistoryFeign {
             ex.printStackTrace();
         }
     }
+
+    @Override
+    public ResultBean<PagerVo<TransferPaymentVo>> transferPaymentList(PagerQuery<TransferPaymentQuery> pq) {
+        ResultBean<PagerVo<TransferPaymentVo>> rb = ResultBean.fireFail();
+        PagerVo<TransferPaymentVo> pv = loanRepaymentHistoryService.transferPaymentList(pq);
+        return rb.success().setData(pv);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java

@@ -8,6 +8,8 @@ import com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceImportReturn;
 import com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceImportVo;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApplyInit;
+import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleHistoryRecord;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterQuery;
 import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo;
@@ -605,7 +607,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         return list;
     }
 
-
+    @Transactional(rollbackFor = Exception.class)
     public ResultBean<String> saveRecords(List<RepaymentExcelInfo> dto) {
         ResultBean rb = ResultBean.fireFail();
         //保存还款记录
@@ -621,7 +623,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                         repaymentHistory.setScheduleSid(planDetail.getScheduleSid());
                         repaymentHistory.setPlanDetailSid(planDetail.getSid());
                         repaymentHistory.setReturnWay("直还");
-                        repaymentHistory.setReturnWayKey("001");
+                        repaymentHistory.setReturnWayKey("01");
                         try {
                             repaymentHistory.setActualDate(sdf.parse(repaymentExcelInfo.getRealReturnTime()));
                         } catch (ParseException e) {
@@ -664,4 +666,178 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         }
         return rb.success().setMsg("删除成功");
     }
+
+    /**
+     * 更新状态
+     *
+     * @param orgPath
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public ResultBean updateState(String orgPath) {
+        ResultBean rb = ResultBean.fireFail();
+        QueryWrapper<LoanRepaymentHistory> qw = new QueryWrapper<>();
+        //=======================
+        String orgSidPath = orgPath;
+        orgSidPath = orgSidPath + "/";
+        int i1 = orgSidPath.indexOf("/");
+        int i2 = orgSidPath.indexOf("/", i1 + 1);
+        int i3 = orgSidPath.indexOf("/", i2 + 1);
+        int i4 = orgSidPath.indexOf("/", i3 + 1);
+        orgSidPath = orgSidPath.substring(0, i3);
+        qw.like("p.orgSidPath", orgSidPath);
+        qw.ne("h.buckleKey", "002");
+        qw.ne("h.buckleKey", "003");
+        qw.eq("h.updateState", "0");
+        List<String> monthHeadAndLast = getMonthHeadAndLast(new Date());
+        String head = monthHeadAndLast.get(0);
+        String last = monthHeadAndLast.get(1);
+        qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')"
+                );
+        List<String> histories = baseMapper.selUpdateStateList(qw);
+        if (!histories.isEmpty()) {
+            for (String historySid : histories) {
+                LoanRepaymentHistory repaymentHistory = fetchBySid(historySid);
+                if (null != repaymentHistory) {
+                    repaymentHistory.setUpdateState("1");
+                    repaymentHistory.setUpdateTime(new DateTime());
+                    baseMapper.updateById(repaymentHistory);
+                }
+            }
+        }
+        return rb.success();
+    }
+
+    public ResultBean<LoanBuckleApplyInit> buckleNewInit(String orgPath) {
+        ResultBean<LoanBuckleApplyInit> rb = ResultBean.fireFail();
+        LoanBuckleApplyInit vo = new LoanBuckleApplyInit();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        vo.setApplyDate(sdf.format(new Date()));
+        List<LoanBuckleHistoryRecord> historyRecords = new ArrayList<>();
+        QueryWrapper<LoanRepaymentHistory> qw = new QueryWrapper<>();
+        //=======================
+        String orgSidPath = orgPath;
+        orgSidPath = orgSidPath + "/";
+        int i1 = orgSidPath.indexOf("/");
+        int i2 = orgSidPath.indexOf("/", i1 + 1);
+        int i3 = orgSidPath.indexOf("/", i2 + 1);
+        int i4 = orgSidPath.indexOf("/", i3 + 1);
+        orgSidPath = orgSidPath.substring(0, i3);
+        qw.like("p.orgSidPath", orgSidPath);
+        qw.ne("h.buckleKey", "002");
+        qw.ne("h.buckleKey", "003");
+        List<String> monthHeadAndLast = getMonthHeadAndLast(new Date());
+        String head = monthHeadAndLast.get(0);
+        String last = monthHeadAndLast.get(1);
+        qw.apply(StringUtils.isNotEmpty(head), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(last), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')"
+                );
+        List<LoanRepaymentHistoryVo> histories = baseMapper.selbuckleNewInitList(qw);
+        Set<String> planSids = new HashSet<>();
+        if (!histories.isEmpty()) {
+            for (LoanRepaymentHistoryVo history : histories) {
+                String planDetailSid = history.getPlanDetailSid();
+                List<LoanRepaymentHistory> historyList = baseMapper.selByPlanSid(planDetailSid);
+                if (!historyList.isEmpty()) {
+                    BigDecimal actualMoney = new BigDecimal(0);
+                    for (LoanRepaymentHistory repaymentHistory : historyList) {
+                        actualMoney = repaymentHistory.getActualMoney().add(actualMoney);
+                    }
+                    if (actualMoney.compareTo(BigDecimal.ZERO) == -1) {
+                        planSids.add(planDetailSid);
+                    }
+                }
+            }
+        }
+        Iterator<LoanRepaymentHistoryVo> it = histories.iterator();
+        while (it.hasNext()) {
+            LoanRepaymentHistoryVo historyVo = it.next();
+            if (!planSids.isEmpty()) {
+                if (planSids.contains(historyVo.getPlanDetailSid())) {
+                    it.remove();
+                }
+            }
+        }
+        if (!histories.isEmpty()) {
+            for (LoanRepaymentHistoryVo history : histories) {
+                LoanBuckleHistoryRecord record = new LoanBuckleHistoryRecord();
+                LoanRepaymentHistoryRecordVo recordVo = baseMapper.buckleInfo(history.getSid());
+                if (null != recordVo) {
+                    BeanUtil.copyProperties(recordVo, record);
+                }
+                historyRecords.add(record);
+            }
+        }
+        vo.setRecords(historyRecords);
+        return rb.success().setData(vo);
+    }
+
+    /**
+     * 间还转付记录列表
+     * @param pq
+     * @return
+     */
+    public PagerVo<TransferPaymentVo> transferPaymentList(PagerQuery<TransferPaymentQuery> pq) {
+        IPage<LoanRepaymentHistory> page = PagerUtil.queryToPage(pq);
+        TransferPaymentQuery pagerQuery = pq.getParams();
+        QueryWrapper<LoanRepaymentHistory> qw = new QueryWrapper<>();
+        //=======================
+        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+        privilegeQuery.setOrgPath(pagerQuery.getOrgPath());
+        privilegeQuery.setMenuSid(pagerQuery.getMenuSid());
+        privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl());
+        privilegeQuery.setUserSid(pagerQuery.getUserSid());
+        ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+            //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+            String orgSidPath = pagerQuery.getOrgPath();
+            orgSidPath = orgSidPath + "/";
+            int i1 = orgSidPath.indexOf("/");
+            int i2 = orgSidPath.indexOf("/", i1 + 1);
+            int i3 = orgSidPath.indexOf("/", i2 + 1);
+            int i4 = orgSidPath.indexOf("/", i3 + 1);
+            String orgLevelKey = defaultIdReltBean.getData();
+            if ("1".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i1);
+                qw.like("p.orgSidPath", orgSidPath);
+            } else if ("2".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i2);
+                qw.like("p.orgSidPath", orgSidPath);
+            } else if ("3".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i3);
+                qw.like("p.orgSidPath", orgSidPath);
+            } else if ("4".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i4);
+                qw.like("p.orgSidPath", orgSidPath);
+            } else if ("5".equals(orgLevelKey)) {
+                qw.eq("p.salesUserSid", pagerQuery.getUserSid());
+            } else {
+                PagerVo<TransferPaymentVo> p = new PagerVo<>();
+                return p;
+            }
+        } else {
+            PagerVo<TransferPaymentVo> p = new PagerVo<>();
+            return p;
+        }
+        //=======================
+        if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {
+            qw.like("p.vinNo", pagerQuery.getVinNo());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getBankName())) {
+            qw.like("p.bankName", pagerQuery.getBankName());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getBankContractNo())) {
+            qw.like("p.bankContractNo", pagerQuery.getBankContractNo());
+        }
+        String dueStartDate = pagerQuery.getDueStartDate();
+        String dueEndDate = pagerQuery.getDueEndDate();
+        qw.apply(StringUtils.isNotEmpty(dueStartDate), "date_format (p.dueDate,'%Y-%m-%d') >= date_format('" + dueStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(dueEndDate), "date_format (p.dueDate,'%Y-%m-%d') <= date_format('" + dueEndDate + "','%Y-%m-%d')"
+                );
+        IPage<TransferPaymentVo> pagging = baseMapper.transferPaymentList(page, qw);
+        List<TransferPaymentVo> records = pagging.getRecords();
+        PagerVo<TransferPaymentVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyMapper.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.riskcenter.biz.loantransferpaymentapply;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.riskcenter.api.loanbuckleapply.LoanBuckleApply;
+import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApplyVo;
+import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.LoanTransferPaymentApply;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+
+@Mapper
+public interface LoanTransferPaymentApplyMapper extends BaseMapper<LoanTransferPaymentApply> {
+
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.riskcenter.biz.loantransferpaymentapply.LoanTransferPaymentApplyMapper">
+
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyRest.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.riskcenter.biz.loantransferpaymentapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.riskcenter.api.loanbuckleapply.*;
+import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppBuckleDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanbuckleapply.flow.*;
+import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.LoanTransferPaymentApplyFeign;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+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;
+
+import java.util.List;
+
+
+@Api(tags = "代收代付申请")
+@RestController
+@RequestMapping("v1/loantransferpaymentapply")
+public class LoanTransferPaymentApplyRest implements LoanTransferPaymentApplyFeign {
+
+
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java

@@ -0,0 +1,70 @@
+package com.yxt.anrui.riskcenter.biz.loantransferpaymentapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.yxt.anrui.base.common.enums.BillTypeEnum;
+import com.yxt.anrui.base.common.utils.Rule;
+import com.yxt.anrui.base.common.utils.domain.BillNo;
+import com.yxt.anrui.flowable.api.flow.FlowableFeign;
+import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
+import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery;
+import com.yxt.anrui.flowable.api.flow2.FlowFeign;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
+import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.riskcenter.api.loanbuckleapply.*;
+import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppBuckleDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppRecordVo;
+import com.yxt.anrui.riskcenter.api.loanbuckleapply.flow.*;
+import com.yxt.anrui.riskcenter.api.loanbuckleapplyrecord.LoanBuckleApplyRecord;
+import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
+import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
+import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
+import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistoryRecordVo;
+import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.LoanTransferPaymentApply;
+import com.yxt.anrui.riskcenter.biz.loanbuckleapplyrecord.LoanBuckleApplyRecordService;
+import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
+import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService;
+import com.yxt.common.base.config.component.FileUploadComponent;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.messagecenter.api.message.MessageFeign;
+import com.yxt.messagecenter.api.message.MessageFlowVo;
+import com.yxt.messagecenter.api.message.MessageFlowableQuery;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.stream.Collectors;
+
+/**
+ * @description:
+ * @author: fzz
+ * @date: 2023/7/6
+ **/
+@Service
+public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTransferPaymentApplyMapper, LoanTransferPaymentApply> {
+
+
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordMapper.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.riskcenter.biz.loantransferpaymentrecord;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.riskcenter.api.loanbuckleapplyrecord.LoanBuckleApplyRecord;
+import com.yxt.anrui.riskcenter.api.loantransferpaymentrecord.LoanTransferPaymentRecord;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+@Mapper
+public interface LoanTransferPaymentRecordMapper extends BaseMapper<LoanTransferPaymentRecord> {
+
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.riskcenter.biz.loantransferpaymentrecord.LoanTransferPaymentRecordMapper">
+
+
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordRest.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.riskcenter.biz.loantransferpaymentrecord;
+
+import com.yxt.anrui.riskcenter.api.loanbuckleapplyrecord.LoanBuckleApplyRecordFeign;
+import com.yxt.anrui.riskcenter.api.loantransferpaymentrecord.LoanTransferPaymentRecordFeign;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@Api(tags = "代收代付记录")
+@RestController
+@RequestMapping("v1/loantransferpaymentrecord")
+public class LoanTransferPaymentRecordRest implements LoanTransferPaymentRecordFeign {
+
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordService.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.riskcenter.biz.loantransferpaymentrecord;
+
+
+import com.yxt.anrui.riskcenter.api.loantransferpaymentrecord.LoanTransferPaymentRecord;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: fzz
+ * @date: 2023/7/6
+ **/
+@Service
+public class LoanTransferPaymentRecordService extends MybatisBaseService<LoanTransferPaymentRecordMapper, LoanTransferPaymentRecord> {
+
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/logback-spring.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
 
-	<property name="log.base" value="logs/anrui_business_center" />
+	<property name="log.base" value="logs/risk" />
 
 	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder>