diff --git a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java
index 240a82e1..2b6dba94 100644
--- a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java
+++ b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java
@@ -696,7 +696,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
             queryWrapper.eq(CashOut::getUserId, cashOut.getUserId());
         }
         if (StrUtil.isNotBlank(cashOut.getUserName())) {
-            queryWrapper.like(CashOut::getUserName, cashOut.getUserName());
+            queryWrapper.like(CashOut::getZhifubaoName, cashOut.getUserName());
         }
         if (StrUtil.isNotBlank(cashOut.getZhifubaoName())) {
             queryWrapper.like(CashOut::getZhifubaoName, cashOut.getZhifubaoName());
@@ -715,11 +715,11 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
         }
 
         if (StrUtil.isNotBlank(cashOut.getStartTime()) && StrUtil.isNotBlank(cashOut.getEndTime())) {
-            queryWrapper.between(CashOut::getCreateAt, cashOut.getStartTime(), cashOut.getEndTime());
+            queryWrapper.between(CashOut::getCreateAt, DateUtil.parseUTC(cashOut.getStartTime()).toString(), DateUtil.parseUTC(cashOut.getEndTime()).toString());
         } else if (StrUtil.isNotBlank(cashOut.getStartTime())) {
-            queryWrapper.ge(CashOut::getCreateAt, cashOut.getStartTime());
+            queryWrapper.ge(CashOut::getCreateAt, DateUtil.parseUTC(cashOut.getStartTime()).toString());
         } else if (StrUtil.isNotBlank(cashOut.getEndTime())) {
-            queryWrapper.le(CashOut::getCreateAt, cashOut.getEndTime());
+            queryWrapper.le(CashOut::getCreateAt, DateUtil.parseUTC(cashOut.getEndTime()).toString());
         }
 
         queryWrapper.orderByDesc(CashOut::getCreateAt);
@@ -892,28 +892,34 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
         data.put("count", count);
         List<Map<String, Object>> list = new ArrayList<>();
         data.put("list", list);
-        List<UserEntity> userList = userDao.selectList(Wrappers.<UserEntity>lambdaQuery().eq(UserEntity::getZhiFuBaoName, alipayAccountName));
-        if (CollUtil.isEmpty(userList)) {
+        List<CashOut> cashOutList = cashOutDao.selectList(Wrappers.<CashOut>lambdaQuery().eq(CashOut::getState,1).eq(CashOut::getZhifubaoName, alipayAccountName));
+        if (CollUtil.isEmpty(cashOutList)) {
             return data;
         }
-
-        for (UserEntity entity : userList) {
+        Map<Long, List<CashOut>> collect = cashOutList.stream().collect(Collectors.groupingBy(CashOut::getUserId));
+        for (Map.Entry<Long, List<CashOut>> entry : collect.entrySet()) {
+            Long k = entry.getKey();
+            List<CashOut> v = entry.getValue();
+            BigDecimal subSum = v.stream().map(obj->Convert.toBigDecimal(obj.getMoney())).reduce(BigDecimal.ZERO, BigDecimal::add);
             Map<String, Object> record = new HashMap<>();
-            record.put("userId", entity.getUserId());
-            record.put("userName", entity.getUserName());
-            record.put("inviterCode", entity.getInviterCode());
-            record.put("phone", entity.getPhone());
-            record.put("zhiFuBaoName", entity.getZhiFuBaoName());
-            record.put("zhiFuBao", entity.getZhiFuBao());
-            // 累计提现金额
-            BigDecimal subSum = baseMapper.selectSumMoney(entity.getUserId(), 1);
+            record.put("userId", k);
+            record.put("userName", "未知");
+            record.put("inviterCode", "");
+            record.put("phone", "");
+            record.put("zhiFuBaoName", v.stream().map(CashOut::getZhifubaoName).distinct().collect(Collectors.joining(" / ")));
+            record.put("zhiFuBao", v.stream().map(CashOut::getZhifubao).distinct().collect(Collectors.joining(" / ")));
+            UserEntity entity = userDao.selectById(k);
+            if(entity!=null){
+                record.put("userId", entity.getUserId());
+                record.put("userName", entity.getUserName());
+                record.put("inviterCode", entity.getInviterCode());
+                record.put("phone", entity.getPhone());
+            }
             record.put("subTotal", NumberUtil.null2Zero(subSum));
-            // 累计提现次数
-            Integer subCount = baseMapper.selectCount(Wrappers.<CashOut>lambdaQuery().eq(CashOut::getUserId, entity.getUserId()).eq(CashOut::getState, 1));
-            record.put("subCount", subCount == null ? 0 : subCount);
+            record.put("subCount", v.size());
             list.add(record);
             sum = NumberUtil.add(sum, NumberUtil.null2Zero(subSum));
-            count = count + subCount;
+            count = count + v.size();
         }
         data.put("sum", sum);
         data.put("count", count);