Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118'…

performance-api/src/main/java/com/clx/performance/param/pc/loan/carrier/PageCarrierOwnerRepaymentParam.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * @ClassName PageCarrierOwnerRepaymentParam
  * @Description
@@ -38,4 +40,7 @@ public class PageCarrierOwnerRepaymentParam extends PageParam {
     @ApiModelProperty("10 未逾期  20 已逾期")
     private Integer beOverdue;
 
+    @ApiModelProperty("10 待付款 40 付款中 50 付款成功 60 付款失败")
+    private List<Integer> inStatusList;
+
 }

performance-web/src/main/java/com/clx/performance/controller/pc/loan/carrier/CarrierOwnerRepaymentController.java

@@ -13,10 +13,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 @Slf4j
@@ -46,4 +43,12 @@ public class CarrierOwnerRepaymentController {
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }
 
+    @ApiOperation(value = "逾期且未还款的记录",notes = "<br>By:jiwngwenye")
+    @GetMapping("/ownerRepaymentOverdueList")
+    @UnitCovert(param = false)
+    public Result<PageData<OwnerRepaymentVO>> ownerRepaymentOverdueList() {
+        IPage<OwnerRepaymentVO> page  = ownerRepaymentService.ownerRepaymentOverdueList();
+        return Result.page(page.getRecords(),page.getTotal(),page.getPages());
+    }
+
 }

performance-web/src/main/java/com/clx/performance/dao/impl/loan/OwnerRepaymentDaoImpl.java

@@ -46,6 +46,9 @@ public class OwnerRepaymentDaoImpl extends BaseDaoImpl<OwnerRepaymentMapper, Own
         if(Objects.nonNull(param.getBeOverdue())){
             query.like(OwnerRepayment :: getBeOverdue,param.getBeOverdue());
         }
+        if(Objects.nonNull(param.getInStatusList())){
+            query.in(OwnerRepayment :: getStatus,param.getInStatusList());
+        }
         query.orderByDesc(OwnerRepayment :: getCreateTime);
         return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
     }

performance-web/src/main/java/com/clx/performance/service/impl/loan/OwnerRepaymentServiceImpl.java

@@ -32,11 +32,14 @@ import com.msl.document.api.feign.ContractEvidenceFeign;
 import com.msl.document.api.feign.ContractTemplateFeign;
 import com.msl.document.api.param.GenerateContractParam;
 import com.msl.document.api.vo.ContractEvidenceRecordVo;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -70,6 +73,28 @@ public class OwnerRepaymentServiceImpl  implements OwnerRepaymentService {
         return returnPage;
     }
 
+    @Override
+    public IPage<OwnerRepaymentVO> ownerRepaymentOverdueList() {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        PageCarrierOwnerRepaymentParam param = new PageCarrierOwnerRepaymentParam();
+        param.setOwnerUserNo(String.valueOf(loginUserInfo.getUserNo()));
+        List<Integer> inStatusList = new ArrayList<>();
+        inStatusList.add(OwnerRePaymentEnum.Status.PAYING.getCode());
+        inStatusList.add(OwnerRePaymentEnum.Status.PAY_WAIT.getCode());
+        inStatusList.add(OwnerRePaymentEnum.Status.PAY_FAIL.getCode());
+        param.setInStatusList(inStatusList);
+        param.setBeOverdue(OwnerRePaymentEnum.BeOverdue.YES.getCode());
+
+        IPage<OwnerRepayment> page = ownerRepaymentDao.pageOwnerRepayment(param);
+        List<OwnerRepaymentVO> records = ownerRepaymentStruct.convertList(page.getRecords());
+        IPage<OwnerRepaymentVO> returnPage = new Page<>();
+        returnPage.setPages(page.getPages());
+        returnPage.setTotal(page.getTotal());
+        returnPage.setRecords(records);
+        return returnPage;
+    }
+
+
     @Override
     public IPage<OwnerRepaymentVO> pageOwnerRepaymentOfOwner(PageOwnerRepaymentOfOwner param) {
         return ownerRepaymentDao.pageByParam(param);

performance-web/src/main/java/com/clx/performance/service/loan/OwnerRepaymentService.java

@@ -18,6 +18,8 @@ public interface OwnerRepaymentService {
 
     IPage<OwnerRepaymentVO> pageOwnerRepayment(PageCarrierOwnerRepaymentParam param);
 
+    IPage<OwnerRepaymentVO> ownerRepaymentOverdueList();
+
     IPage<OwnerRepaymentVO> pageOwnerRepaymentOfOwner(PageOwnerRepaymentOfOwner param);
 
     OwnerCashierInfoVO getCashierInfo(Integer id);