PageStudioAxfApplyRequest add merchantNo 分页查询安心付申请记录

api/src/main/java/com/jiejing/fitness/finance/api/axf/request/PageStudioAxfApplyRequest.java

@@ -30,6 +30,9 @@ public class PageStudioAxfApplyRequest {
   @ApiModelProperty(value = "商户简称")
   private String shortName;
 
+  @ApiModelProperty(value = "支付宝pid")
+  private String merchantNo;
+
   @ApiModelProperty(value = "申请开始时间")
   private Date createTimeStart;
 

repository/src/main/java/com/jiejing/fitness/finance/repository/service/StudioAxfApplyRpService.java

@@ -57,7 +57,7 @@ public class StudioAxfApplyRpService extends MapperRepoService<Long, StudioAxfAp
   }
 
   public org.springframework.data.domain.Page<StudioAxfApply> page(Long studioId, String instName,
-      String shortName, Date createTimeStart,
+      String shortName, String merchantNo, Date createTimeStart,
       Date createTimeEnd, List<AxfStateEnums> stateList, Integer current, Integer size) {
     QueryWrapper<StudioAxfApply> wrapper = new QueryWrapper<>();
     if (null != studioId) {
@@ -69,6 +69,9 @@ public class StudioAxfApplyRpService extends MapperRepoService<Long, StudioAxfAp
     if (StringUtils.isNotBlank(shortName)) {
       wrapper.like(StudioAxfApply.SHORT_NAME, shortName);
     }
+    if (StringUtils.isNotBlank(merchantNo)){
+      wrapper.eq(StudioAxfApply.MERCHANT_NO, merchantNo);
+    }
     if (CollectionUtils.isNotEmpty(stateList)) {
       wrapper.in(StudioAxfApply.STATE, stateList);
     }

service/src/main/java/com/jiejing/fitness/finance/service/axf/impl/AxfServiceImpl.java

@@ -540,7 +540,8 @@ public class AxfServiceImpl implements AxfService {
   public PageVO<StudioAxfApplyVO> page(PageStudioAxfApplyRequest request) {
     org.springframework.data.domain.Page<StudioAxfApply> page = studioAxfApplyRpService.page(
         request.getStudioId(), request.getStudioName(),
-        request.getShortName(), request.getCreateTimeStart(), request.getCreateTimeEnd(),
+        request.getShortName(), request.getMerchantNo(),
+        request.getCreateTimeStart(), request.getCreateTimeEnd(),
         request.getStateList(), request.getCurrent(), request.getSize());
     return PageVO.convert(page, AxfConvert.toList(page.getContent()));
   }