更新！

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/ExpenseFlowServiceImpl.java

@@ -18,6 +18,7 @@ import com.github.microservice.net.ResultContent;
 import com.github.microservice.net.ResultMessage;
 import com.github.microservice.types.OrderModeType;
 import com.github.microservice.types.OrderState;
+import com.zhongshu.card.client.model.base.SuperSearch;
 import com.zhongshu.card.client.model.operLogs.OperationLogsAddParam;
 import com.zhongshu.card.client.model.payment.ExpenseFlowCount;
 import com.zhongshu.card.client.model.payment.ExpenseFlowModel;
@@ -493,6 +494,16 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         return ResultContent.buildSuccess(PageEntityUtil.concurrent2PageModel(page, this::toModel));
     }
 
+    private void initSearchProjectOid(SuperSearch param) {
+        if (param != null) {
+            String projectOid = param.getProjectOid();
+            if (StringUtils.isEmpty(projectOid)) {
+                projectOid = getCurrentProjectOid();
+            }
+            param.setProjectOid(projectOid);
+        }
+    }
+
     /**
      * 商户订单查询
      *
@@ -505,12 +516,14 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         // 查询支付成功的
         param.setIsPaySuccess(Boolean.TRUE);
         param.setOrderModeType(OrderModeType.Consume);
+
+        initSearchProjectOid(param);
         // 用户搜索的商户
-        List<String> shopOids = getSearchAllShopOid(param);
-        if (ObjectUtils.isEmpty(shopOids)) {
-            return ResultContent.buildFail("请选择查询商户或所有的");
-        }
-        param.setShopOids(shopOids);
+//        List<String> shopOids = getSearchAllShopOid(param);
+//        if (ObjectUtils.isEmpty(shopOids)) {
+//            return ResultContent.buildFail("请选择查询商户或所有的");
+//        }
+//        param.setShopOids(shopOids);
         Page<ExpenseFlow> page = expenseFlowDao.page(pageable, param);
         return ResultContent.buildSuccess(PageEntityUtil.concurrent2PageModel(page, this::toModel));
     }
@@ -573,12 +586,14 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         // 查询支付成功的
         param.setIsPaySuccess(Boolean.TRUE);
         param.setOrderModeType(OrderModeType.Consume);
-        // 用户搜索的商户
-        List<String> shopOids = getSearchAllShopOid(param);
-        if (ObjectUtils.isEmpty(shopOids)) {
-            return ResultContent.buildFail("请选择查询商户或所有的");
-        }
-        param.setShopOids(shopOids);
+
+        initSearchProjectOid(param);
+//        // 用户搜索的商户
+//        List<String> shopOids = getSearchAllShopOid(param);
+//        if (ObjectUtils.isEmpty(shopOids)) {
+//            return ResultContent.buildFail("请选择查询商户或所有的");
+//        }
+//        param.setShopOids(shopOids);
         ExpenseFlowCount flowCount = expenseFlowDao.countBuinessMainPayment(param);
         return ResultContent.buildSuccess(flowCount);
     }
@@ -597,11 +612,12 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         param.setOrderModeType(OrderModeType.Consume);
         BeanUtils.copyProperties(statisticSearch, param);
 
-        List<String> shopOids = getSearchAllShopOid(param);
-        if (ObjectUtils.isEmpty(shopOids)) {
-            return ResultContent.buildFail("请选择查询商户或所有的");
-        }
-        param.setShopOids(shopOids);
+        initSearchProjectOid(param);
+//        List<String> shopOids = getSearchAllShopOid(param);
+//        if (ObjectUtils.isEmpty(shopOids)) {
+//            return ResultContent.buildFail("请选择查询商户或所有的");
+//        }
+//        param.setShopOids(shopOids);
 
         param.setYear(DateUtils.getCurrentYear());
         // 统计模型，按 月、周