feat:pay page

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

@@ -7,6 +7,7 @@ import com.jiejing.paycenter.common.enums.merchant.SubChannelEnums;
 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.Date;
+import java.util.List;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
@@ -54,6 +55,9 @@ public class PageStudioCashierRequest {
   @ApiModelProperty("交易状态")
   @ApiModelProperty("交易状态")
   private BrandCashierTransStateEnum transState;
   private BrandCashierTransStateEnum transState;
 
 
+  @ApiModelProperty("交易状态集合")
+  private List<BrandCashierTransStateEnum> transStateList;
+
   @ApiModelProperty("业务订单类型（来源）")
   @ApiModelProperty("业务订单类型（来源）")
   private PayOrderTypeEnum orderType;
   private PayOrderTypeEnum orderType;
 
 

repository/src/main/java/com/jiejing/fitness/finance/repository/mapper/StudioCashierRecordMapper.xml

@@ -28,7 +28,7 @@
   </select>
   </select>
 
 
   <select id="sumMerchantPaySuccess" resultType="java.math.BigDecimal">
   <select id="sumMerchantPaySuccess" resultType="java.math.BigDecimal">
-    select sum(trans_amount)
+    select sum(actual_amount)
     from studio_cashier_record
     from studio_cashier_record
     where merchant_id = #{merchantId}
     where merchant_id = #{merchantId}
       and trans_state = 'PAY_SUCCESS'
       and trans_state = 'PAY_SUCCESS'
@@ -38,7 +38,7 @@
 
 
   <select id="sumMerchantPaySuccessGroupByStudioId"
   <select id="sumMerchantPaySuccessGroupByStudioId"
     resultType="com.jiejing.fitness.finance.repository.entity.StudioCashierRecord">
     resultType="com.jiejing.fitness.finance.repository.entity.StudioCashierRecord">
-    select studio_id, sum(trans_amount) as trans_amount
+    select studio_id, sum(actual_amount) as trans_amount
     from studio_cashier_record
     from studio_cashier_record
     where merchant_id = #{merchantId}
     where merchant_id = #{merchantId}
       and trans_state = 'PAY_SUCCESS'
       and trans_state = 'PAY_SUCCESS'

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

@@ -5,6 +5,7 @@ import com.jiejing.fitness.enums.finance.BrandCashierTransTypeEnum;
 import com.jiejing.fitness.enums.finance.PayOrderTypeEnum;
 import com.jiejing.fitness.enums.finance.PayOrderTypeEnum;
 import com.jiejing.paycenter.common.enums.merchant.SubChannelEnums;
 import com.jiejing.paycenter.common.enums.merchant.SubChannelEnums;
 import java.util.Date;
 import java.util.Date;
+import java.util.List;
 import lombok.Data;
 import lombok.Data;
 
 
 /**
 /**
@@ -69,6 +70,13 @@ public class PageBrandCashierRecordQuery {
   private String transState;
   private String transState;
 
 
   /**
   /**
+   * 交易状态
+   *
+   * @see BrandCashierTransStateEnum
+   */
+  private List<String> transStateList;
+
+  /**
    * 业务订单类型（来源）
    * 业务订单类型（来源）
    *
    *
    * @see PayOrderTypeEnum
    * @see PayOrderTypeEnum

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

@@ -7,6 +7,7 @@ import com.jiejing.paycenter.common.enums.merchant.SubChannelEnums;
 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.Date;
+import java.util.List;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder;
@@ -54,6 +55,9 @@ public class PageStudioCashierParams {
   @ApiModelProperty("交易状态")
   @ApiModelProperty("交易状态")
   private BrandCashierTransStateEnum transState;
   private BrandCashierTransStateEnum transState;
 
 
+  @ApiModelProperty("交易状态集合")
+  private List<BrandCashierTransStateEnum> transStateList;
+
   @ApiModelProperty("业务订单类型（来源）")
   @ApiModelProperty("业务订单类型（来源）")
   private PayOrderTypeEnum orderType;
   private PayOrderTypeEnum orderType;