Merge branch 'master' of http://gitea.dctpay.com/hurui/youtao

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")
+@RequestMapping(value = "/partnerData")
-@Api(value = "合伙人")
+@Api(value = "合伙人统计")
 public class PartnerController {
     private static final Logger log = LoggerFactory.getLogger(PartnerController.class);
 

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);
     }
 }

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;
     }
 
     // 竞选成功返利

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;
 }