Răsfoiți Sursa

feat: 转账列表支持时间范围筛选

alphaH 2 săptămâni în urmă
părinte
comite
e190048604

+ 4 - 2
java/src/main/java/com/payment/platform/module/payment/account/controller/AccountController.java

@@ -79,8 +79,10 @@ public class AccountController {
             @RequestParam(name = "page_no", defaultValue = "1") int pageNo, @RequestParam(name = "page_size", defaultValue = "20") int pageSize,
             @RequestParam(name = "out_biz_no", required = false) String outBizNo, @RequestParam(required = false) String status,
             @RequestParam(name = "tenant_id", required = false) Long tenantId,
-            @RequestParam(name = "enterprise_id", required = false) String enterpriseId) {
-        return Result.ok(accountService.transferList(pageNo, pageSize, outBizNo, status, tenantId, enterpriseId));
+            @RequestParam(name = "enterprise_id", required = false) String enterpriseId,
+            @RequestParam(name = "start_time", required = false) String startTime,
+            @RequestParam(name = "end_time", required = false) String endTime) {
+        return Result.ok(accountService.transferList(pageNo, pageSize, outBizNo, status, tenantId, enterpriseId, startTime, endTime));
     }
 
     @PreAuthorize("@perm.hasAny('module_payment:account:transfer:list')")

+ 3 - 1
java/src/main/java/com/payment/platform/module/payment/account/service/AccountService.java

@@ -188,12 +188,14 @@ public class AccountService {
     }
 
     public PageResult<TransferVO> transferList(int pageNo, int pageSize, String outBizNo, String status,
-            Long tenantId, String enterpriseId) {
+            Long tenantId, String enterpriseId, String startTime, String endTime) {
         var w = new LambdaQueryWrapper<TransferEntity>().orderByDesc(TransferEntity::getId);
         if (outBizNo != null && !outBizNo.isBlank()) w.eq(TransferEntity::getOutBizNo, outBizNo);
         if (status != null && !status.isBlank()) w.eq(TransferEntity::getStatus, status);
         if (tenantId != null) w.eq(TransferEntity::getTenantId, tenantId);
         if (enterpriseId != null && !enterpriseId.isBlank()) w.eq(TransferEntity::getEnterpriseId, enterpriseId);
+        if (startTime != null && !startTime.isBlank()) w.ge(TransferEntity::getCreatedTime, parseDateTime(startTime));
+        if (endTime != null && !endTime.isBlank()) w.le(TransferEntity::getCreatedTime, parseDateTime(endTime));
         var p = new Page<TransferEntity>(pageNo, pageSize);
         var r = transferMapper.selectPage(p, w);
         List<TransferVO> items = r.getRecords().stream().map(this::transferVO).toList();