feat:time

api/src/main/java/com/jiejing/fitness/finance/api/merchant/request/PageStudioMerchantApplyRequest.java

@@ -5,6 +5,7 @@ import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
 import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
 import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
@@ -53,6 +54,12 @@ public class PageStudioMerchantApplyRequest {
   @ApiModelProperty(value = "微信线下商户号")
   @ApiModelProperty(value = "微信线下商户号")
   private String wxOfflineMerchantNo;
   private String wxOfflineMerchantNo;
 
 
+  @ApiModelProperty(value = "申请开始日期")
+  private Date startTime;
+
+  @ApiModelProperty(value = "申请结束日期")
+  private Date endTime;
+
   @ApiModelProperty(value = "页码：0开始", required = true)
   @ApiModelProperty(value = "页码：0开始", required = true)
   @NotNull(message = "页码不能为空")
   @NotNull(message = "页码不能为空")
   private Integer current;
   private Integer current;

repository/src/main/java/com/jiejing/fitness/finance/repository/query/PageStudioMerchantApplyQuery.java

@@ -3,6 +3,7 @@ package com.jiejing.fitness.finance.repository.query;
 import com.jiejing.fitness.enums.finance.ApplyTypeEnum;
 import com.jiejing.fitness.enums.finance.ApplyTypeEnum;
 import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
 import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
 import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
 import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 import lombok.Data;
 import lombok.Data;
 
 
@@ -69,6 +70,16 @@ public class PageStudioMerchantApplyQuery {
   private String wxOfflineMerchantNo;
   private String wxOfflineMerchantNo;
 
 
   /**
   /**
+   * 申请开始日期
+   */
+  private Date startTime;
+
+  /**
+   * 申请结束日期
+   */
+  private Date endTime;
+
+  /**
    * 页码：0开始
    * 页码：0开始
    */
    */
   private Integer current;
   private Integer current;

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

@@ -71,6 +71,12 @@ public class StudioMerchantApplyRpService extends
     if (StringUtil.isNotBlank(params.getWxOfflineMerchantNo())) {
     if (StringUtil.isNotBlank(params.getWxOfflineMerchantNo())) {
       wrapper.eq(StudioMerchantApply.WX_OFFLINE_MERCHANT_NO, params.getWxOfflineMerchantNo());
       wrapper.eq(StudioMerchantApply.WX_OFFLINE_MERCHANT_NO, params.getWxOfflineMerchantNo());
     }
     }
+    if (null != params.getStartTime()) {
+      wrapper.ge(StudioMerchantApply.CREATE_TIME, params.getStartTime());
+    }
+    if (null != params.getEndTime()) {
+      wrapper.le(StudioMerchantApply.CREATE_TIME, params.getEndTime());
+    }
     return this.findByWrapperPage(wrapper, params.getCurrent(), params.getSize());
     return this.findByWrapperPage(wrapper, params.getCurrent(), params.getSize());
   }
   }
 
 

service/src/main/java/com/jiejing/fitness/finance/service/merchant/params/PageStudioMerchantApplyParams.java

@@ -5,6 +5,7 @@ import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
 import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
 import com.jiejing.paycenter.common.enums.merchant.CompanyTypeEnums;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
@@ -53,6 +54,12 @@ public class PageStudioMerchantApplyParams {
   @ApiModelProperty(value = "微信线下商户号")
   @ApiModelProperty(value = "微信线下商户号")
   private String wxOfflineMerchantNo;
   private String wxOfflineMerchantNo;
 
 
+  @ApiModelProperty(value = "申请开始日期")
+  private Date startTime;
+
+  @ApiModelProperty(value = "申请结束日期")
+  private Date endTime;
+
   @ApiModelProperty(value = "页码：0开始", required = true)
   @ApiModelProperty(value = "页码：0开始", required = true)
   @NotNull(message = "页码不能为空")
   @NotNull(message = "页码不能为空")
   private Integer current;
   private Integer current;