筛选待处理和已处理的

FullCardClient/src/main/java/com/zhongshu/card/client/model/pay/WithdrawPageParam.java

@@ -1,5 +1,6 @@
 package com.zhongshu.card.client.model.pay;
 
+import com.zhongshu.card.client.type.AuditStatus;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -20,4 +21,7 @@ public class WithdrawPageParam {
 
     @Schema(description = "索引")
     private String search;
+
+    @Schema(description = "处理状态")
+    private AuditStatus auditStatus;
 }

FullCardClient/src/main/java/com/zhongshu/card/client/type/AuditStatus.java

@@ -6,7 +6,8 @@ public enum AuditStatus {
 
     Wait("待审核", 0),
     Success("审核成功",1),
-    Fail("审核失败",1)
+    Fail("审核失败",1),
+    Processed("已处理", 1)
     ;
 
     @Getter

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/pay/extend/WithdrawOrderDaoExtend.java

@@ -1,6 +1,7 @@
 package com.zhongshu.card.server.core.dao.pay.extend;
 
 import com.zhongshu.card.client.model.pay.WithdrawPageParam;
+import com.zhongshu.card.client.type.AuditStatus;
 import com.zhongshu.card.client.type.WithdrawStatus;
 import com.zhongshu.card.server.core.domain.pay.WithdrawOrder;
 import org.springframework.data.domain.Page;
@@ -8,7 +9,7 @@ import org.springframework.data.domain.Pageable;
 
 public interface WithdrawOrderDaoExtend {
 
-    Page<WithdrawOrder> page(Pageable pageable, String projectOid, String oid, Long startTime, Long endTime, String search);
+    Page<WithdrawOrder> page(Pageable pageable, String projectOid, String oid, Long startTime, Long endTime, String search, AuditStatus auditStatus);
 
     boolean updateWithdrawStatus(String id, WithdrawStatus status, String withdrawStatusDesc);
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/pay/impl/WithdrawOrderDaoImpl.java

@@ -3,6 +3,7 @@ package com.zhongshu.card.server.core.dao.pay.impl;
 import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
 import com.zhongshu.card.client.model.pay.WithdrawPageParam;
+import com.zhongshu.card.client.type.AuditStatus;
 import com.zhongshu.card.client.type.WithdrawStatus;
 import com.zhongshu.card.server.core.dao.pay.WithdrawOrderDao;
 import com.zhongshu.card.server.core.dao.pay.extend.WithdrawOrderDaoExtend;
@@ -17,6 +18,7 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 
+import java.util.List;
 import java.util.regex.Pattern;
 
 public class WithdrawOrderDaoImpl implements WithdrawOrderDaoExtend {
@@ -28,7 +30,7 @@ public class WithdrawOrderDaoImpl implements WithdrawOrderDaoExtend {
     MongoTemplate mongoTemplate;
 
     @Override
-    public Page<WithdrawOrder> page(Pageable pageable, String projectOid, String oid, Long startTime, Long endTime, String search) {
+    public Page<WithdrawOrder> page(Pageable pageable, String projectOid, String oid, Long startTime, Long endTime, String search, AuditStatus auditStatus) {
         Criteria criteria = new Criteria();
 
         if (StringUtils.isNotBlank(projectOid)) {
@@ -48,6 +50,14 @@ public class WithdrawOrderDaoImpl implements WithdrawOrderDaoExtend {
             criteria.and("withdrawUser.name").regex(namePattern);
         }
 
+        if (auditStatus != null) {
+            if (auditStatus.equals(AuditStatus.Processed)){
+                criteria.and("auditStatus").in(List.of(AuditStatus.Success, AuditStatus.Fail));
+            }else {
+                criteria.and("auditStatus").is(auditStatus);
+            }
+        }
+
         Query query = new Query(criteria);
         query.with(Sort.by(Sort.Order.asc("sort"), Sort.Order.desc("createTime")));
         return dbHelper.pages(query, pageable, WithdrawOrder.class);

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/pay/WithdrawService.java

@@ -108,7 +108,7 @@ public class WithdrawService extends SuperService {
         String userId = getCurrentUserId();
         // 查询用户加入的所有机构
         List<String> oids = organizationUserService.getUserOrgListOids(userId, projectOid);
-        //TODO 可优化，通过group去查询账本，目前测试环境数据还没初始化group
+        //TODO 可优化，通过group去查询账本，目前测试环境数据还没初始化group{projectoid}{oid}
         if (ObjectUtils.isNotEmpty(oids)) {
             for (String oid : oids) {
                 PayAccount orgChildren = payAccountService.getOrgChildren(projectOid, oid, PaymentChannelType.Settle);
@@ -480,7 +480,7 @@ public class WithdrawService extends SuperService {
         }
         boolean isProjectManager = userOrgPermissService.userIsProjectManager(projectOid, userId);
         if (isProjectManager) {
-            Page<WithdrawOrder> page = withdrawOrderDao.page(pageable, projectOid, null, param.getStartTime(), param.getEndTime(), param.getSearch());
+            Page<WithdrawOrder> page = withdrawOrderDao.page(pageable, projectOid, null, param.getStartTime(), param.getEndTime(), param.getSearch(), param.getAuditStatus());
             return com.github.microservice.net.ResultContent.buildContent(PageEntityUtil.concurrent2PageModel(page, this::toModel));
         }
         List<String> userManagerOids = userOrgPermissService.getUserManagerOids(projectOid, userId);
@@ -489,7 +489,7 @@ public class WithdrawService extends SuperService {
             return com.github.microservice.net.ResultContent.buildContent(PageEntityUtil.buildEmptyPage(pageable));
         }
 
-        Page<WithdrawOrder> page = withdrawOrderDao.page(pageable, projectOid, userManagerOids.get(0), param.getStartTime(), param.getEndTime(), param.getSearch());
+        Page<WithdrawOrder> page = withdrawOrderDao.page(pageable, projectOid, userManagerOids.get(0), param.getStartTime(), param.getEndTime(), param.getSearch(), param.getAuditStatus());
         return com.github.microservice.net.ResultContent.buildContent(PageEntityUtil.concurrent2PageModel(page, this::toModel));
     }