feat:settle

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

@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Lists;
 import com.jiejing.common.utils.collection.CollectionUtil;
 import com.jiejing.common.utils.collection.CollectionUtil;
 import com.jiejing.common.utils.text.StringUtil;
 import com.jiejing.common.utils.text.StringUtil;
+import com.jiejing.fitness.enums.finance.BrandCashierTransStateEnum;
 import com.jiejing.fitness.enums.finance.BrandCashierTransTypeEnum;
 import com.jiejing.fitness.enums.finance.BrandCashierTransTypeEnum;
 import com.jiejing.fitness.finance.api.cashier.vo.StudioCashierStatisticVO;
 import com.jiejing.fitness.finance.api.cashier.vo.StudioCashierStatisticVO;
 import com.jiejing.fitness.finance.api.cashier.vo.StudioSettleVO;
 import com.jiejing.fitness.finance.api.cashier.vo.StudioSettleVO;
@@ -171,6 +172,8 @@ public class StudioCashierRecordRpService extends
       Integer current, Integer size) {
       Integer current, Integer size) {
     QueryWrapper<StudioCashierRecord> wrapper = new QueryWrapper<>();
     QueryWrapper<StudioCashierRecord> wrapper = new QueryWrapper<>();
     wrapper.eq(StudioCashierRecord.MERCHANT_ID, merchantId);
     wrapper.eq(StudioCashierRecord.MERCHANT_ID, merchantId);
+    wrapper.eq(StudioCashierRecord.TRANS_TYPE, BrandCashierTransTypeEnum.PAY.getCode());
+    wrapper.eq(StudioCashierRecord.TRANS_STATE, BrandCashierTransStateEnum.PAY_SUCCESS.getCode());
     if (null != startTime) {
     if (null != startTime) {
       wrapper.ge(StudioCashierRecord.SUCCESS_TIME, startTime);
       wrapper.ge(StudioCashierRecord.SUCCESS_TIME, startTime);
     }
     }