更新

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/ExpenseFlowSearch.java

@@ -1,5 +1,6 @@
 package com.zhongshu.card.client.model.payment;
 
+import com.github.microservice.types.OrderModeType;
 import com.zhongshu.card.client.model.base.SuperSearch;
 import com.github.microservice.types.OrderState;
 import com.zhongshu.card.client.type.RefundState;
@@ -23,6 +24,9 @@ public class ExpenseFlowSearch extends SuperSearch {
     @Schema(description = "用户userId")
     private String userId;
 
+    @Schema(description = "订单类型")
+    private OrderModeType orderModeType = OrderModeType.Consume;
+
     @Schema(description = "订单状态")
     private List<OrderState> orderTypes;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/payment/ExpenseFlowController.java

@@ -3,6 +3,7 @@ package com.zhongshu.card.server.core.controller.payment;
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.helper.AuthHelper;
 import com.github.microservice.auth.security.type.AuthType;
+import com.github.microservice.types.OrderModeType;
 import com.zhongshu.card.client.model.base.IDParam;
 import com.zhongshu.card.client.model.payment.ExpenseFlowCount;
 import com.zhongshu.card.client.model.payment.ExpenseFlowModel;
@@ -48,6 +49,7 @@ public class ExpenseFlowController {
             @Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
             @Parameter(required = false) ExpenseFlowSearch param) {
         param.setIsPaySuccess(Boolean.TRUE);
+        param.setOrderModeType(OrderModeType.Consume);
         param.setUserId(authHelper.getCurrentUser().getUserId());
         return expenseFlowService.page(param, pageable);
     }
@@ -64,6 +66,7 @@ public class ExpenseFlowController {
     @RequestMapping(value = {"countPayment"}, method = {RequestMethod.POST})
     public ResultContent<ExpenseFlowCount> countPayment(@RequestBody ExpenseFlowSearch param) {
         param.setIsPaySuccess(Boolean.TRUE);
+        param.setOrderModeType(OrderModeType.Consume);
         param.setUserId(authHelper.getCurrentUser().getUserId());
         return expenseFlowService.countUserPayment(param);
     }

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/payment/impl/ExpenseFlowDaoImpl.java

@@ -111,6 +111,11 @@ public class ExpenseFlowDaoImpl extends BaseImpl implements ExpenseFlowDaoExtend
             criteria.and("refundState").is(param.getRefundState());
         }
 
+        // 订单类型 支付、查询余额...
+        if (param.getOrderModeType() != null) {
+            criteria.and("orderModeType").is(param.getOrderModeType());
+        }
+
         // 是否退款
         if (param.getIsRefund() != null) {
             criteria.and("isRefund").is(param.getIsRefund());

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/payment/ExpenseFlow.java

@@ -47,7 +47,7 @@ public class ExpenseFlow extends SuperMain {
     @Schema(description = "订单类型")
     private OrderModeType orderModeType = OrderModeType.Consume;
 
-    @Schema(description = "支付方式")
+    @Schema(description = "支付方式显示")
     @Indexed
     private String paymentWay;