feat:pay

api/src/main/java/com/jiejing/fitness/finance/api/cashier/request/PageStudioCashierRequest.java

@@ -28,9 +28,12 @@ public class PageStudioCashierRequest {
   @ApiModelProperty(value = "场馆名称")
   @ApiModelProperty(value = "场馆名称")
   private String studioName;
   private String studioName;
 
 
-  @ApiModelProperty(value = "场馆订单号")
+  @ApiModelProperty(value = "场馆业务订单ID")
   private String orderNo;
   private String orderNo;
 
 
+  @ApiModelProperty(value = "场馆业务订单号", notes = "需要结合场馆ID进行筛选")
+  private String businessNo;
+
   @ApiModelProperty(value = "场馆业务子订单号")
   @ApiModelProperty(value = "场馆业务子订单号")
   private String subOrderNo;
   private String subOrderNo;
 
 

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

@@ -18,11 +18,16 @@ import lombok.Data;
 public class PageBrandCashierRecordQuery {
 public class PageBrandCashierRecordQuery {
 
 
   /**
   /**
-   * 场馆订单号
+   * 场馆订单ID
    */
    */
   private String orderNo;
   private String orderNo;
 
 
   /**
   /**
+   * 场馆订单号
+   */
+  private String businessNo;
+
+  /**
    * 场馆业务子订单号
    * 场馆业务子订单号
    */
    */
   private String subOrderNo;
   private String subOrderNo;

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

@@ -61,6 +61,12 @@ public class StudioCashierRecordRpService extends
     if (StringUtil.isNotBlank(query.getOrderNo())) {
     if (StringUtil.isNotBlank(query.getOrderNo())) {
       wrapper.eq(StudioCashierRecord.ORDER_NO, query.getOrderNo());
       wrapper.eq(StudioCashierRecord.ORDER_NO, query.getOrderNo());
     }
     }
+    if (StringUtil.isNotBlank(query.getBusinessNo())) {
+      wrapper.eq(StudioCashierRecord.BUSINESS_NO, query.getBusinessNo());
+    }
+    if (null != query.getStudioId()) {
+      wrapper.eq(StudioCashierRecord.STUDIO_ID, query.getStudioId());
+    }
     if (StringUtil.isNotBlank(query.getSubOrderNo())) {
     if (StringUtil.isNotBlank(query.getSubOrderNo())) {
       wrapper.eq(StudioCashierRecord.SUB_ORDER_NO, query.getSubOrderNo());
       wrapper.eq(StudioCashierRecord.SUB_ORDER_NO, query.getSubOrderNo());
     }
     }
@@ -79,9 +85,6 @@ public class StudioCashierRecordRpService extends
     if (StringUtil.isNotBlank(query.getThirdTransNo())) {
     if (StringUtil.isNotBlank(query.getThirdTransNo())) {
       wrapper.eq(StudioCashierRecord.THIRD_TRANS_NO, query.getThirdTransNo());
       wrapper.eq(StudioCashierRecord.THIRD_TRANS_NO, query.getThirdTransNo());
     }
     }
-    if (null != query.getStudioId()) {
-      wrapper.eq(StudioCashierRecord.STUDIO_ID, query.getStudioId());
-    }
     if (StringUtil.isNotBlank(query.getBuyerName())) {
     if (StringUtil.isNotBlank(query.getBuyerName())) {
       wrapper.like(StudioCashierRecord.BUYER_NAME, query.getBuyerName());
       wrapper.like(StudioCashierRecord.BUYER_NAME, query.getBuyerName());
     }
     }

service/src/main/java/com/jiejing/fitness/finance/service/cashier/params/PageStudioCashierParams.java

@@ -25,9 +25,12 @@ import lombok.NoArgsConstructor;
 @ApiModel(description = "品牌收银流水分页Params")
 @ApiModel(description = "品牌收银流水分页Params")
 public class PageStudioCashierParams {
 public class PageStudioCashierParams {
 
 
-  @ApiModelProperty(value = "场馆业务订单号")
+  @ApiModelProperty(value = "场馆业务订单ID")
   private String orderNo;
   private String orderNo;
 
 
+  @ApiModelProperty(value = "场馆业务订单号", notes = "需要结合场馆ID进行筛选")
+  private String businessNo;
+
   @ApiModelProperty(value = "场馆业务子订单号")
   @ApiModelProperty(value = "场馆业务子订单号")
   private String subOrderNo;
   private String subOrderNo;