From 1714892f3f182a72332e0b89c50b24d06f18578b Mon Sep 17 00:00:00 2001
From: yuanye <418471657@qq.com>
Date: Fri, 18 Oct 2024 14:37:40 +0800
Subject: [PATCH] Merge branch 'master' of http://gitea.dctpay.com/hurui/youtao

---
 .../java/com/hfkj/controller/partner/PartnerController.java   | 4 ++--
 .../service/partner/Impl/BsPartnerUserRecordServiceImpl.java  | 2 +-
 .../com/hfkj/service/partner/Impl/PartnerServiceImpl.java     | 4 ++--
 .../main/java/com/hfkj/service/partner/PartnerService.java    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bweb/src/main/java/com/hfkj/controller/partner/PartnerController.java b/bweb/src/main/java/com/hfkj/controller/partner/PartnerController.java
index e369000..e179473 100644
--- a/bweb/src/main/java/com/hfkj/controller/partner/PartnerController.java
+++ b/bweb/src/main/java/com/hfkj/controller/partner/PartnerController.java
@@ -31,8 +31,8 @@ import java.util.List;
 import java.util.Map;
 
 @Controller
-@RequestMapping(value = "/partner")
-@Api(value = "合伙人")
+@RequestMapping(value = "/partnerData")
+@Api(value = "合伙人统计")
 public class PartnerController {
     private static final Logger log = LoggerFactory.getLogger(PartnerController.class);
 
diff --git a/service/src/main/java/com/hfkj/service/partner/Impl/BsPartnerUserRecordServiceImpl.java b/service/src/main/java/com/hfkj/service/partner/Impl/BsPartnerUserRecordServiceImpl.java
index b7aa024..9ec8e19 100644
--- a/service/src/main/java/com/hfkj/service/partner/Impl/BsPartnerUserRecordServiceImpl.java
+++ b/service/src/main/java/com/hfkj/service/partner/Impl/BsPartnerUserRecordServiceImpl.java
@@ -96,6 +96,6 @@ public class BsPartnerUserRecordServiceImpl implements BsPartnerUserRecordServic
         if (MapUtils.getInteger(map, "status") != null) {
             criteria.andStatusEqualTo(MapUtils.getInteger(map, "status"));
         }
-        return Collections.emptyList();
+        return bsPartnerUserRecordMapper.selectByExample(example);
     }
 }
diff --git a/service/src/main/java/com/hfkj/service/partner/Impl/PartnerServiceImpl.java b/service/src/main/java/com/hfkj/service/partner/Impl/PartnerServiceImpl.java
index 6bdf853..d0fd899 100644
--- a/service/src/main/java/com/hfkj/service/partner/Impl/PartnerServiceImpl.java
+++ b/service/src/main/java/com/hfkj/service/partner/Impl/PartnerServiceImpl.java
@@ -417,7 +417,7 @@ public class PartnerServiceImpl implements PartnerService {
     }
 
     @Override
-    public JSONObject dividendData(Long startTime, Long endTime) throws Exception {
+    public List<JSONObject> dividendData(Long startTime, Long endTime) throws Exception {
         Map<String, Object> params = new HashMap<>();
         params.put("startTime", startTime);
         params.put("endTime", endTime);
@@ -433,7 +433,7 @@ public class PartnerServiceImpl implements PartnerService {
             goodObject.put("dividendGoldCoin", pres.stream().map(BsPartnerUserRecord::getGoldCoin).reduce(BigDecimal.ZERO, BigDecimal::add));
             return goodObject;
         }).collect(Collectors.toList());
-        return null;
+        return countRecords;
     }
 
     // 竞选成功返利
diff --git a/service/src/main/java/com/hfkj/service/partner/PartnerService.java b/service/src/main/java/com/hfkj/service/partner/PartnerService.java
index b195181..071fcdf 100644
--- a/service/src/main/java/com/hfkj/service/partner/PartnerService.java
+++ b/service/src/main/java/com/hfkj/service/partner/PartnerService.java
@@ -53,5 +53,5 @@ public interface PartnerService {
      * @Author: Sum1Dream
      * @Date: 2024/10/18 下午2:25
      */
-    JSONObject dividendData(Long startTime, Long endTime) throws Exception;
+    List<JSONObject> dividendData(Long startTime, Long endTime) throws Exception;
 }