合伙人首页调整

src/main/java/com/ydtech/modules/admin/controller/APPPartnerController.java

@@ -32,11 +32,11 @@ public class APPPartnerController extends BaseController {
     /**
      * 首页信息
      */
-    @GetMapping("/getHomePage")
+    @PostMapping("/getHomePage")
     @ApiOperation(value = "APP首页信息")
-    public HttpResult<AppPartnerNumVo> getHomePage(@RequestParam("type") Integer type) {
+    public HttpResult<AppPartnerNumVo> getHomePage(@RequestBody AppHomePageDto appHomePageDto) {
 
-        return HttpResult.ok("success", this.sysPartnerService.getHomePage(type));
+        return HttpResult.ok("success", this.sysPartnerService.getHomePage(appHomePageDto));
     }
 
 

src/main/java/com/ydtech/modules/admin/model/dto/AppHomePageDto.java

@@ -0,0 +1,21 @@
+package com.ydtech.modules.admin.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class AppHomePageDto {
+
+    @ApiModelProperty(value = "类型1：合伙人 2：工作室")
+    private Integer type;
+
+    @ApiModelProperty(value = "开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String beginTime;
+
+    @ApiModelProperty(value = "结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String endTime;
+
+}

src/main/java/com/ydtech/modules/admin/model/vo/AppPartnerNumVo.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.admin.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -8,17 +9,14 @@ import java.math.BigDecimal;
 import java.util.List;
 
 @Data
+@ApiModel("合伙人APP首页信息")
 public class AppPartnerNumVo {
-
     /**
      * 总保费
      */
     @ApiModelProperty(value = "总保费")
     @JsonFormat(pattern = "0.00")
     private BigDecimal sumPremium;
-
-
-
     /**
      * 抽成费用
      */
@@ -26,18 +24,24 @@ public class AppPartnerNumVo {
     @JsonFormat(pattern = "0.00")
     private BigDecimal extractFee;
     /**
-     * 团队总人数
+     * 账户余额
      */
-    @ApiModelProperty(value = "团队总人数")
-    private Integer TeamManNum;
+    @ApiModelProperty(value = "账户余额")
+    @JsonFormat(pattern = "0.00")
+    private BigDecimal balanceFee;
 
+    @ApiModelProperty(value = "订单数")
+    private Integer orderNumber;
+    /**
+     * 会员总人数
+     */
+    @ApiModelProperty(value = "会员总人数")
+    private Integer TeamManNum;
     /**
      * 所有合伙人数
      */
     @ApiModelProperty(value = "下级所有合伙人数")
     private Integer partnerNum;
-
-
     /**
      * 合伙人直接工作室数
      */
@@ -47,7 +51,6 @@ public class AppPartnerNumVo {
     @ApiModelProperty(value = "管理员ids")
     private List<String> leaderIds;
 
-
     //工作室
     @ApiModelProperty(value = "工作室下团队人数")
     private Integer workroomManNum;
@@ -58,9 +61,4 @@ public class AppPartnerNumVo {
     @ApiModelProperty(value = "工作室下团队ids")
     private List<String> deptIds;
 
-
-
-
-
-
 }

src/main/java/com/ydtech/modules/admin/service/SysPartnerService.java

@@ -47,7 +47,7 @@ public interface SysPartnerService extends IService<SysPartner> {
 
     APPPartnerInfoFreeVo getTeamInfo(PartnerGradeInfo partnerGradeInfo);
 
-    AppPartnerNumVo getHomePage(Integer type);
+    AppPartnerNumVo getHomePage(AppHomePageDto appHomePageDto);
 
     AppUserInfoVo getUserInfo(Integer type);
 

src/main/java/com/ydtech/modules/admin/service/impl/SysPartnerServiceImpl.java

@@ -779,16 +779,46 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
     }
 
     @Override
-    public AppPartnerNumVo getHomePage(Integer type) {
+    public AppPartnerNumVo getHomePage(AppHomePageDto appHomePageDto) {
         AppPartnerNumVo appPartnerNumVo = new AppPartnerNumVo();
+        Integer type = appHomePageDto.getType();
         //合伙人：1 ；工作室管理员：2
         String userId = BaseController.getUserId();
         SysPartnerAccount sysPartnerAccount = sysPartnerAccountMapper.selectOne(new LambdaQueryWrapper<SysPartnerAccount>()
                 .eq(SysPartnerAccount::getUserId, userId));
         if (sysPartnerAccount != null) {
-            appPartnerNumVo.setSumPremium(sysPartnerAccount.getSumPremium());
-            appPartnerNumVo.setExtractFee(sysPartnerAccount.getExtractFee());
+//            appPartnerNumVo.setSumPremium(sysPartnerAccount.getSumPremium());
+//            appPartnerNumVo.setExtractFee(sysPartnerAccount.getExtractFee());
+            appPartnerNumVo.setBalanceFee(sysPartnerAccount.getCashFee());
         }
+        BigDecimal sumPremium=BigDecimal.ZERO;
+        //增加时间筛选
+        List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
+                .eq(SysPremiumDetails::getUserId, userId)
+                .between(StringUtils.isNotEmpty(appHomePageDto.getBeginTime()) && StringUtils.isNotEmpty(appHomePageDto.getEndTime()),
+                        SysPremiumDetails::getCreateTime, appHomePageDto.getBeginTime(), appHomePageDto.getEndTime())
+                .eq(SysPremiumDetails::getStatus, 1));
+
+        Map<String, List<SysPremiumDetails>> map = sysPremiumDetails.stream().sorted(Comparator.comparing(SysPremiumDetails::getId))
+                .collect(Collectors.groupingBy(SysPremiumDetails::getCompanyId));
+        for (String s : map.keySet()) {
+            List<SysPremiumDetails> sysPremiumDetails1 = map.get(s);
+            sumPremium = sumPremium.add(sysPremiumDetails1.get(0).getSumpremium());
+        }
+        BigDecimal extractFee= sysPremiumDetails.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
+        appPartnerNumVo.setSumPremium(sumPremium);
+        appPartnerNumVo.setExtractFee(extractFee);
+        appPartnerNumVo.setOrderNumber(map.size());
+//        //历史提现
+//        List<SysAgencyFeeApproval> sysAgencyFeeApprovals = sysAgencyFeeApprovalMapper.selectList(new LambdaQueryWrapper<SysAgencyFeeApproval>()
+//                .eq(SysAgencyFeeApproval::getUserId, userId)
+//                .eq(SysAgencyFeeApproval::getStatus, 1)
+//                .between(StringUtils.isNotEmpty(appHomePageDto.getBeginTime()) && StringUtils.isNotEmpty(appHomePageDto.getEndTime()),
+//                        SysAgencyFeeApproval::getCreateTime, appHomePageDto.getBeginTime(), appHomePageDto.getEndTime()));
+//        BigDecimal historyFee = sysAgencyFeeApprovals.stream().map(SysAgencyFeeApproval::getHistoryFee).reduce(BigDecimal.ZERO, BigDecimal::add);
+//        BigDecimal balanceFee = extractFee.subtract(historyFee);
+//        appPartnerNumVo.setBalanceFee(balanceFee);
+
         if (type == 1) {
             //下面合伙人（直接）数量
             List<SysRelationPerson> sysRelationPersonList1 = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
@@ -828,7 +858,9 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                         if (sysDeptList.size() > 0) {
                             for (SysDept sysDept : sysDeptList) {
                                 List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
-                                        .likeRight(SysUser::getId, sysDept.getId()).ne(SysUser::getStatus, 0));
+                                        .likeRight(SysUser::getId, sysDept.getId()).ne(SysUser::getStatus, 0)
+                                        .between(StringUtils.isNotEmpty(appHomePageDto.getBeginTime()) && StringUtils.isNotEmpty(appHomePageDto.getEndTime()),
+                                                SysUser::getCreateTime, appHomePageDto.getBeginTime(), appHomePageDto.getEndTime()));
                                 deptManNum = deptManNum + sysUsers.size();
 
                             }
@@ -852,7 +884,9 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
             if (sysDeptList.size() > 0) {
                 for (SysDept sysDept : sysDeptList) {
                     List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
-                            .likeRight(SysUser::getId, sysDept.getId()).ne(SysUser::getStatus, 0));
+                            .likeRight(SysUser::getId, sysDept.getId()).ne(SysUser::getStatus, 0)
+                            .between(StringUtils.isNotEmpty(appHomePageDto.getBeginTime()) && StringUtils.isNotEmpty(appHomePageDto.getEndTime()),
+                                    SysUser::getCreateTime, appHomePageDto.getBeginTime(), appHomePageDto.getEndTime()));
                     deptManNum = deptManNum + sysUsers.size();
                     deptIds.add(sysDept.getId());
                 }