Merge remote-tracking branch 'origin/test' into test

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

@@ -140,7 +140,7 @@ public class APPPartnerController extends BaseController {
             commissionInfoDto.setPageNum(1);
         }
         if (commissionInfoDto.getPageSize() == 0) {
-            commissionInfoDto.setPageSize(20);
+            commissionInfoDto.setPageSize(10);
         }
 
         return HttpResult.ok("success",this.sysPartnerService.getCommissionInfo(commissionInfoDto));

src/main/java/com/ydtech/modules/admin/dao/SysPremiumDetailsMapper.java

@@ -5,14 +5,20 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.modules.admin.model.SysPremiumDetails;
 import com.ydtech.modules.admin.model.dto.AgencyUserInsAreaDto;
+import com.ydtech.modules.admin.model.dto.CommissionInfoDto;
 import com.ydtech.modules.admin.model.vo.AgencyUserInsAreaVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 @Mapper
 public interface SysPremiumDetailsMapper extends BaseMapper<SysPremiumDetails> {
 
     void updateStatus(String id);
 
     IPage<AgencyUserInsAreaVo> queryInsAreaPageById(Page page,@Param("dto") AgencyUserInsAreaDto agencyUserInsAreaDto);
+
+    Map<String, Object> queryInfoPage(@Param("userId") String userId,  @Param("dto") CommissionInfoDto commissionInfoDto);
 }

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

@@ -119,4 +119,11 @@ public class SysUserBaseVO {
 
     @ApiModelProperty(value = "银行卡号信息")
     private String bankCardNumbers;
+
+
+    @ApiModelProperty(value = "身份证号")
+    private String identity;
+
+    @ApiModelProperty(value = "居住地址")
+    private String liveAddress = "";
 }

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

@@ -81,11 +81,15 @@ public class ProfitAnalysisServiceImpl implements ProfitAnalysisService {
                     String enterCardNum = analysisDto.getEnterCardNum();
                     InvAccountCardVo outAccount = invAccountMapper.getByCarNumber(outCardNum);
                     InvAccountCardVo enterAccount  = invAccountMapper.getByCarNumber(enterCardNum);
-                    if(StringUtils.isNotEmpty(outAccount.getOuterFlag()) && StringUtils.isNotEmpty(enterAccount.getOuterFlag())){
-                        if(!enterAccount.getOuterFlag().equals(outAccount.getOuterFlag())){
-                            variableCost=variableCost.add(analysisDto.getApplyAmount());
+                    if(ObjectUtils.isNotEmpty(outAccount) &&  ObjectUtils.isNotEmpty(enterAccount) ){
+                        if( (StringUtils.isNotEmpty(outAccount.getOuterFlag()) && StringUtils.isNotEmpty(enterAccount.getOuterFlag()))){
+                            if(!enterAccount.getOuterFlag().equals(outAccount.getOuterFlag())){
+                                variableCost=variableCost.add(analysisDto.getApplyAmount());
+                            }
                         }
                     }
+
+
                 }
                 profitAnalysisDto.setVariableCost(variableCost);
             }

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

@@ -23,7 +23,6 @@ import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.dao.*;
 import com.ydtech.modules.admin.model.*;
 import com.ydtech.modules.admin.model.dto.*;
-import com.ydtech.modules.admin.model.po.SysUserAccountHistory;
 import com.ydtech.modules.admin.model.vo.*;
 import com.ydtech.modules.admin.service.SysAgencyLeaderService;
 import com.ydtech.modules.admin.service.SysPartnerService;
@@ -714,8 +713,13 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                         .eq(SysPremiumDetails::getStatus, 1)
                         .eq(partnerGradeInfo.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerGradeInfo.getIndustrySector()));
                 if (sysPremiumDetails.size() > 0) {
-                    SysPremiumDetails sysPremiumDetails1 = sysPremiumDetails.get(0);
-                    sumPremium = sumPremium.add(sysPremiumDetails1.getSumpremium());
+                    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 reduce = sysPremiumDetails.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
                     extractFee = extractFee.add(reduce);
                 }
@@ -746,8 +750,14 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                     .eq(SysPremiumDetails::getStatus, 1)
                     .eq(partnerGradeInfo.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerGradeInfo.getIndustrySector()));
             if (sysPremiumDetails.size() > 0) {
-                SysPremiumDetails sysPremiumDetails1 = sysPremiumDetails.get(0);
-                sumPremium1 = sumPremium1.add(sysPremiumDetails1.getSumpremium());
+                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);
+                    sumPremium1 = sumPremium1.add(sysPremiumDetails1.get(0).getSumpremium());
+                }
+//                SysPremiumDetails sysPremiumDetails1 = sysPremiumDetails.get(0);
+//                sumPremium1 = sumPremium1.add(sysPremiumDetails1.getSumpremium());
                 BigDecimal reduce = sysPremiumDetails.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
                 extractFee1 = extractFee1.add(reduce);
             }
@@ -1050,26 +1060,41 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                     List<String> list1 = sysRelationPersons.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
                     appSysPartnerVo.setLeaderIds(list1);
                 }
+                //所有工作室
+                List<SysRelationPerson> sysRelationPersons1 = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
+                        .in(CollectionUtil.isNotEmpty(ids), SysRelationPerson::getSuggestId, ids)
+                        .eq(SysRelationPerson::getDelFlag, 1)
+                        .eq(SysRelationPerson::getType, 1));
+
                 //直接工作室下所有的人
-                List<String> userIds = getUserIds(sysRelationPersons);
+                List<String> userIds = getUserIds(sysRelationPersons1);
 
+                BigDecimal sumPremium = BigDecimal.ZERO;
+                BigDecimal extractFee = BigDecimal.ZERO;
                 if (CollectionUtil.isNotEmpty(userIds)) {
-                    List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
-                            .eq(SysPremiumDetails::getUserId, BaseController.getUserId())
-                            .in(SysPremiumDetails::getIssuerId,userIds)
-                            .between(StringUtils.isNotEmpty(partnerInfoDto.getBeginTime()) && StringUtils.isNotEmpty(partnerInfoDto.getEndTime()),
-                                    SysPremiumDetails::getCreateTime, partnerInfoDto.getBeginTime(), partnerInfoDto.getEndTime())
-                            .eq(partnerInfoDto.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerInfoDto.getIndustrySector())
-                            .eq(SysPremiumDetails::getStatus, 1));
-                    BigDecimal sumPremium = sysPremiumDetails.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-                    BigDecimal extractFee = sysPremiumDetails.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
+                    for (String id : userIds) {
+                        List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
+                                .eq(SysPremiumDetails::getUserId, BaseController.getUserId())
+                                .eq(SysPremiumDetails::getIssuerId,id)
+                                .between(StringUtils.isNotEmpty(partnerInfoDto.getBeginTime()) && StringUtils.isNotEmpty(partnerInfoDto.getEndTime()),
+                                        SysPremiumDetails::getCreateTime, partnerInfoDto.getBeginTime(), partnerInfoDto.getEndTime())
+                                .eq(partnerInfoDto.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerInfoDto.getIndustrySector())
+                                .eq(SysPremiumDetails::getStatus, 1));
+                        if (CollectionUtil.isNotEmpty(sysPremiumDetails)) {
+                            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 reduce = sysPremiumDetails.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
+                            extractFee = extractFee.add(reduce);
+                        }
 
-                    appSysPartnerVo.setSumPremium(sumPremium);
-                    appSysPartnerVo.setExtractFee(extractFee);
-                }else {
-                    appSysPartnerVo.setSumPremium(BigDecimal.ZERO);
-                    appSysPartnerVo.setExtractFee(BigDecimal.ZERO);
+                    }
                 }
+                appSysPartnerVo.setSumPremium(sumPremium);
+                appSysPartnerVo.setExtractFee(extractFee);
                 //每一级存入map
                 appSysPartnerVos.add(appSysPartnerVo);
             }
@@ -1147,26 +1172,42 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                     .eq(SysRelationPerson::getDelFlag, 1)
                     .eq(SysRelationPerson::getSource, 0)
                     .eq(SysRelationPerson::getType, 1));
-            //直接工作室下所有的人
-            List<String> userIds = getUserIds(sysRelationPersons);
-
+            //工作室下所有的人
+            List<SysRelationPerson> sysRelationPersons1 = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
+                    .in(SysRelationPerson::getSuggestId, partnerIds)
+                    .eq(SysRelationPerson::getDelFlag, 1)
+                    .eq(SysRelationPerson::getType, 1));
+            List<String> userIds = getUserIds(sysRelationPersons1);
+            BigDecimal sumPremium = BigDecimal.ZERO;
+            BigDecimal extractFee = BigDecimal.ZERO;
             if (CollectionUtil.isNotEmpty(userIds)) {
-                //费用
-                List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
-                        .eq(SysPremiumDetails::getUserId, loginId)
-                        .in(SysPremiumDetails::getIssuerId,userIds)
-                        .between(StringUtils.isNotEmpty(partnerGradeInfo.getBeginTime()) && StringUtils.isNotEmpty(partnerGradeInfo.getEndTime()),
-                                SysPremiumDetails::getCreateTime, partnerGradeInfo.getBeginTime(), partnerGradeInfo.getEndTime())
-                        .eq(partnerGradeInfo.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerGradeInfo.getIndustrySector())
-                        .eq(SysPremiumDetails::getStatus, 1));
-                BigDecimal sumPremium = sysPremiumDetails.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-                BigDecimal extractFee = sysPremiumDetails.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
-                partnerInfoFreeVo.setSumPremium(sumPremium);
-                partnerInfoFreeVo.setExtractFee(extractFee);
-            }else {
-                partnerInfoFreeVo.setSumPremium(BigDecimal.ZERO);
-                partnerInfoFreeVo.setExtractFee(BigDecimal.ZERO);
+                for (String userId : userIds) {
+
+                    //费用
+                    List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
+                            .eq(SysPremiumDetails::getUserId, loginId)
+                            .eq(SysPremiumDetails::getIssuerId,userId)
+                            .between(StringUtils.isNotEmpty(partnerGradeInfo.getBeginTime()) && StringUtils.isNotEmpty(partnerGradeInfo.getEndTime()),
+                                    SysPremiumDetails::getCreateTime, partnerGradeInfo.getBeginTime(), partnerGradeInfo.getEndTime())
+                            .eq(partnerGradeInfo.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerGradeInfo.getIndustrySector())
+                            .eq(SysPremiumDetails::getStatus, 1));
+                    if (CollectionUtil.isNotEmpty(sysPremiumDetails)) {
+                        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());
+                        }
+
+//                        sumPremium = sumPremium.add(sysPremiumDetails.get(0).getSumpremium());
+                        BigDecimal reduce = sysPremiumDetails.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
+                        extractFee = extractFee.add(reduce);
+                    }
+
+                }
             }
+            partnerInfoFreeVo.setSumPremium(sumPremium);
+            partnerInfoFreeVo.setExtractFee(extractFee);
 
             //合伙人
             List<SysPartner> sysPartnerList = sysPartnerMapper.selectList(new LambdaQueryWrapper<SysPartner>()
@@ -1201,33 +1242,45 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                     List<String> collects = sysRelationPersonList1.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
                     partnerInfoVo.setLeaderIds(collects);
                     partnerInfoVo.setWorkNumber(collects.size());
-
-                    List<String> userIds1 = getUserIds(sysRelationPersonList1);
-                    if (CollectionUtil.isNotEmpty(userIds1)) {
-                        //费用
-                        List<SysPremiumDetails> sysPremiumDetail = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
-                                .eq(SysPremiumDetails::getUserId, loginId)
-                                .in(SysPremiumDetails::getIssuerId,userIds1)
-                                .between(StringUtils.isNotEmpty(partnerGradeInfo.getBeginTime()) && StringUtils.isNotEmpty(partnerGradeInfo.getEndTime()),
-                                        SysPremiumDetails::getCreateTime, partnerGradeInfo.getBeginTime(), partnerGradeInfo.getEndTime())
-                                .eq(SysPremiumDetails::getStatus, 1)
-                                .eq(partnerGradeInfo.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerGradeInfo.getIndustrySector()));
-                        BigDecimal sumPremium1 = sysPremiumDetail.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-                        BigDecimal extractFee1 = sysPremiumDetail.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
-                        partnerInfoVo.setSumPremium(sumPremium1);
-                        partnerInfoVo.setExtractFee(extractFee1);
-                    }else {
-                        partnerInfoVo.setSumPremium(BigDecimal.ZERO);
-                        partnerInfoVo.setExtractFee(BigDecimal.ZERO);
-                    }
-
-
+                    //所有贡献费用
                     //合伙人下所有工作室数 核算总代理人数
                     List<SysRelationPerson> sysRelationPersonList2 = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
                             .eq(SysRelationPerson::getSuggestId, userId)
                             .eq(SysRelationPerson::getDelFlag, 1)
                             .eq(SysRelationPerson::getType, 1));
 
+                    List<String> userIds1 = getUserIds(sysRelationPersonList2);
+                    BigDecimal sumPremium1 = BigDecimal.ZERO;
+                    BigDecimal extractFee1 = BigDecimal.ZERO;
+                    if (CollectionUtil.isNotEmpty(userIds1)) {
+                        for (String id : userIds1) {
+                            //费用
+                            List<SysPremiumDetails> sysPremiumDetail = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
+                                    .eq(SysPremiumDetails::getUserId, loginId)
+                                    .eq(SysPremiumDetails::getIssuerId,id)
+                                    .between(StringUtils.isNotEmpty(partnerGradeInfo.getBeginTime()) && StringUtils.isNotEmpty(partnerGradeInfo.getEndTime()),
+                                            SysPremiumDetails::getCreateTime, partnerGradeInfo.getBeginTime(), partnerGradeInfo.getEndTime())
+                                    .eq(SysPremiumDetails::getStatus, 1)
+                                    .eq(partnerGradeInfo.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerGradeInfo.getIndustrySector()));
+
+                            if (CollectionUtil.isNotEmpty(sysPremiumDetail)) {
+                                Map<String, List<SysPremiumDetails>> map = sysPremiumDetail.stream().sorted(Comparator.comparing(SysPremiumDetails::getId))
+                                        .collect(Collectors.groupingBy(SysPremiumDetails::getCompanyId));
+                                for (String s : map.keySet()) {
+                                    List<SysPremiumDetails> sysPremiumDetails1 = map.get(s);
+                                    sumPremium1 = sumPremium1.add(sysPremiumDetails1.get(0).getSumpremium());
+                                }
+
+//                                sumPremium1 = sumPremium1.add(sysPremiumDetail.get(0).getSumpremium());
+                                BigDecimal reduce = sysPremiumDetail.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
+                                extractFee1 = extractFee1.add(reduce);
+                            }
+                        }
+
+                    }
+                    partnerInfoVo.setSumPremium(sumPremium1);
+                    partnerInfoVo.setExtractFee(extractFee1);
+
                     int deptManNum = 0;
                     if (sysRelationPersonList2.size() > 0) {
                         List<String> idList = sysRelationPersonList2.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
@@ -1337,6 +1390,8 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
     public BasePageResult<SysPremiumDetailsVo> getCommissionInfo(CommissionInfoDto commissionInfoDto) {
         List<SysPremiumDetailsVo> list = new ArrayList<>();
         String userId = BaseController.getUserId();
+        //int offset = (page - 1) * size;
+        commissionInfoDto.setPageNum( (commissionInfoDto.getPageNum() -1) * commissionInfoDto.getPageSize());
 
         Page<SysPremiumDetails> page = new Page<>(commissionInfoDto.getPageNum(), commissionInfoDto.getPageSize());
 
@@ -1346,8 +1401,15 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                 .between(StringUtils.isNotEmpty(commissionInfoDto.getBeginTime()) && StringUtils.isNotEmpty(commissionInfoDto.getEndTime()),
                         SysPremiumDetails::getCreateTime, commissionInfoDto.getBeginTime(), commissionInfoDto.getEndTime())
                 .orderByDesc(SysPremiumDetails::getId).eq(SysPremiumDetails::getStatus,1));
-        if (CollectionUtil.isEmpty(sysPremiumDetails)) return new BasePageResult<>(commissionInfoDto.getPageNum(), page.getSize(), 0L, 0L,
+
+        Map<String, Object> stringObjectMap = sysPremiumDetailsMapper.queryInfoPage(userId, commissionInfoDto);
+
+        if (CollectionUtil.isEmpty(stringObjectMap)) return new BasePageResult<>(commissionInfoDto.getPageNum(), page.getSize(), 0L, 0L,
                 list);
+
+
+
+
         Map<String, List<SysPremiumDetails>> listMap = sysPremiumDetails.stream().sorted(Comparator.comparing(SysPremiumDetails::getId))
                 .collect(Collectors.groupingBy(SysPremiumDetails::getCompanyId));
         for (String key : listMap.keySet()) {
@@ -1399,7 +1461,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         }
 
         List<SysPremiumDetailsVo> collect = list.stream().limit(page.getSize()).collect(Collectors.toList());
-        long l = list.size() / page.getSize();
+        long l = (list.size()+page.getSize()-1)/page.getSize();
         return new BasePageResult<>(commissionInfoDto.getPageNum(), page.getSize(), list.size(), l,
                 collect);
     }
@@ -1493,8 +1555,14 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                     .eq(SysPremiumDetails::getStatus, 1)
                     .eq(teamUserInfosDto.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, teamUserInfosDto.getIndustrySector()));
             if (sysPremiumDetails.size()>0) {
-                SysPremiumDetails sysPremiumDetails1 = sysPremiumDetails.get(0);
-                sumPremium = sumPremium.add(sysPremiumDetails1.getSumpremium());
+                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());
+                }
+//                SysPremiumDetails sysPremiumDetails1 = sysPremiumDetails.get(0);
+//                sumPremium = sumPremium.add(sysPremiumDetails1.getSumpremium());
                 BigDecimal reduce = sysPremiumDetails.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
                 extractFee = extractFee.add(reduce);
             }
@@ -1515,7 +1583,8 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                 SysUser sysUser1 = sysUserMapper.selectById(esmUserReferrer.getReferrerId());
                 teamUserInfosVo.setLeaderName(sysUser1.getName());
             }
-
+            BigDecimal sumPremium1 =BigDecimal.ZERO;
+            BigDecimal extractFee1 =BigDecimal.ZERO;
             //费用
             List<SysPremiumDetails> sysPremiumDetail = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
                     .eq(SysPremiumDetails::getIssuerId, sysUser.getId())
@@ -1525,13 +1594,17 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                     .eq(SysPremiumDetails::getStatus, 1)
                     .eq(teamUserInfosDto.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, teamUserInfosDto.getIndustrySector()));
             if (sysPremiumDetail.size()>0) {
-                teamUserInfosVo.setSumPremium(sysPremiumDetail.get(0).getSumpremium());
-                BigDecimal extractFee1 = sysPremiumDetail.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
-                teamUserInfosVo.setExtractFee(extractFee1);
-            }else {
-                teamUserInfosVo.setSumPremium(BigDecimal.ZERO);
-                teamUserInfosVo.setExtractFee(BigDecimal.ZERO);
+                Map<String, List<SysPremiumDetails>> map = sysPremiumDetail.stream().sorted(Comparator.comparing(SysPremiumDetails::getId))
+                        .collect(Collectors.groupingBy(SysPremiumDetails::getCompanyId));
+                for (String s : map.keySet()) {
+                    List<SysPremiumDetails> sysPremiumDetails1 = map.get(s);
+                    sumPremium1 = sumPremium1.add(sysPremiumDetails1.get(0).getSumpremium());
+                }
+                extractFee1 =extractFee1.add(sysPremiumDetail.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add)) ;
             }
+
+            teamUserInfosVo.setSumPremium(sumPremium1);
+            teamUserInfosVo.setExtractFee(extractFee1);
             userInfosVoList.add(teamUserInfosVo);
         }
         teamUserInfosFreeVo.setTeamManNum(userIds.size());
@@ -1716,8 +1789,14 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                                     .eq(SysPremiumDetails::getStatus, 1)
                                     .eq(partnerGradeInfo.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerGradeInfo.getIndustrySector()));
                             if (sysPremiumDetail.size() >0) {
-                                SysPremiumDetails sysPremiumDetails = sysPremiumDetail.get(0);
-                                sumPremium1= sumPremium1.add(sysPremiumDetails.getSumpremium());
+                                Map<String, List<SysPremiumDetails>> map = sysPremiumDetail.stream().sorted(Comparator.comparing(SysPremiumDetails::getId))
+                                        .collect(Collectors.groupingBy(SysPremiumDetails::getCompanyId));
+                                for (String s : map.keySet()) {
+                                    List<SysPremiumDetails> sysPremiumDetails1 = map.get(s);
+                                    sumPremium1= sumPremium1.add(sysPremiumDetails1.get(0).getSumpremium());
+                                }
+//                                SysPremiumDetails sysPremiumDetails = sysPremiumDetail.get(0);
+//                                sumPremium1= sumPremium1.add(sysPremiumDetail.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add));
 
                                 extractFee1 = extractFee1.add(sysPremiumDetail.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add));
                             }
@@ -1747,8 +1826,14 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                         .eq(partnerGradeInfo.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerGradeInfo.getIndustrySector()));
 
                 if (sysPremiumDetails.size() >0) {
-                    SysPremiumDetails sysPremiumDetails1 = sysPremiumDetails.get(0);
-                    sumPremium= sumPremium.add(sysPremiumDetails1.getSumpremium());
+                    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());
+                    }
+//                    SysPremiumDetails sysPremiumDetails1 = sysPremiumDetails.get(0);
+//                    sumPremium= sumPremium.add(sysPremiumDetails.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add));
 
                     extractFee = extractFee.add(sysPremiumDetails.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add));
                 }

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -3000,6 +3000,7 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
                     byBxLicenseno.setCommissionFeerate(this.calculateTotal(jqSuperviseCostsProportion,sySuperviseCostsProportion,noSuperviseCostsProportion));
 
                     byBxLicenseno.setAllFeeValue(this.calculateTotal(byBxLicenseno.getOtherFeevalue(),byBxLicenseno.getCommissionFeevalue(),null));
+                    byBxLicenseno.setReceivableAmount(this.calculateTotal(byBxLicenseno.getOtherFeevalue(),byBxLicenseno.getCommissionFeevalue(),null));
 
                     byBxLicenseno.setJqReceivableProportion(this.calculateTotal(jqSuperviseCostsProportion,jqOtherCostsProportion,null));
                     byBxLicenseno.setSyReceivableProportion(this.calculateTotal(sySuperviseCostsProportion,syOtherCostsProportion,null));

src/main/java/com/ydtech/modules/ins/model/vo/res/BxOtherDetailsNorExcel.java

@@ -57,6 +57,6 @@ public class BxOtherDetailsNorExcel {
 
     @ApiModelProperty("跟单费金额")
     @ExcelProperty(value = "跟单费金额",index = 9)
-    private BigDecimal noOtherCostsPremium;
+    private BigDecimal otherFeevalue;
 
 }

src/main/java/com/ydtech/modules/ins/model/vo/res/SettlementFeesExcel.java

@@ -139,7 +139,7 @@ public class SettlementFeesExcel implements Serializable {
 
     @ApiModelProperty("应收金额")
     @ExcelProperty("应收金额")
-    private BigDecimal receivableAmount;
+    private BigDecimal allFeeValue;
 
     @ExcelProperty(value = "创建日期", converter = DateConverter.class)
     @ApiModelProperty(value = "创建日期")

src/main/java/com/ydtech/modules/inv/utils/CheckInsPlyComeUtils.java

@@ -284,15 +284,12 @@ public class CheckInsPlyComeUtils {
     }
 
     private static String pareTimeLocalDate(String signDate) {
-        DateTimeFormatter originalFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        DateTimeFormatter originalFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         DateTimeFormatter targetFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-
-        // 解析原始字符串日期为 LocalDate
-        LocalDate originalDate = LocalDate.parse(signDate, originalFormatter);
-
-        // 将 LocalDate 转换为 LocalDateTime，时间设为午夜
-        LocalDateTime dateTime = originalDate.atStartOfDay();
-        String b = dateTime.format(targetFormatter);
+        // 解析原始字符串日期为 LocalDateTime
+        LocalDateTime originalDateTime = LocalDateTime.parse(signDate, originalFormatter);
+        // 将 LocalDateTime 转换为目标格式的字符串
+        String b = originalDateTime.format(targetFormatter);
         return b;
     }
 

src/main/resources/mapper/modules/admin/SysAmountAuditingMapper.xml

@@ -146,10 +146,12 @@
             <if test="auditingStatus !=null  and auditingStatus != ''">
                 a.auditing_status=#{auditingStatus}
             </if>
+            <if test="auditingStatus !=null  and auditingStatus != '' and auditingStatus == 2">
+                and a.approval != 1
+            </if>
             <if test="amountStatus !=null  and amountStatus != ''">
                 and a.amount_status=#{amountStatus}
             </if>
-
             <if test="id !=null  and id != ''">
                 and a.id=#{id}
             </if>
@@ -278,7 +280,9 @@
             <if test="vo.auditingStatus !=null  and vo.auditingStatus != ''">
                 a.auditing_status=#{vo.auditingStatus}
             </if>
-
+            <if test="vo.auditingStatus !=null and vo.auditingStatus != '' and vo.auditingStatus == 2">
+                and a.approval != 1
+            </if>
             <if test="vo.amountStatus !=null  and vo.amountStatus != ''">
                 and a.amount_status=#{vo.amountStatus}
             </if>

src/main/resources/mapper/modules/admin/SysPremiumDetailsMapper.xml

@@ -46,6 +46,53 @@
         ORDER BY apd.create_time desc
 
     </select>
+    <select id="queryInfoPage" resultType="java.util.Map">
+        SELECT
+            company_id,
+            GROUP_CONCAT(
+                    CONCAT(
+                            '{"id":', id,
+                            ',"orderno":"', orderno,
+                            ',"company_id":"', company_id,
+                            '","user_id":"', user_id,
+                            '","user_name":"', user_name,
+                            '","issuer_id":"', issuer_id,
+                            '","issuer_name":"', issuer_name,
+                            '","jqpremium":', jqpremium,
+                            ',"sypremium":', sypremium,
+                            ',"jypremium":', jypremium,
+                            ',"sumpremium":', sumpremium,
+                            ',"proportional":"', proportional,
+                            '","extract_fee":', extract_fee,
+                            ',"status":', status,
+                            ',"create_time":"', create_time,
+                            '","type":', type,
+                            ',"industry_sector":', industry_sector,
+                            ',"licenseno":"', licenseno,
+                            '","source":', source,
+                            '}'
+                        )
+                ) AS SysPremiumDetails
+        FROM
+            sys_premium_details
+        <where>
+            status = 1
+            <if test="userId !=null and userId !=''">
+                and user_id = #{userId}
+            </if>
+            <if test="dto.industrySector != 0 ">
+                and industry_sector = #{dto.industrySector}
+            </if>
+            <if test="dto.beginTime != null and dto.beginTime != '' and dto.endTime != null and dto.endTime != ''">
+                and (DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') between DATE_FORMAT( #{dto.beginTime}, '%Y-%m-%d %H:%i:%s') and DATE_FORMAT( #{dto.endTime}, '%Y-%m-%d %H:%i:%s'))
+            </if>
+        </where>
+        GROUP BY
+            company_id
+        ORDER BY
+            company_id ASC
+        LIMIT #{dto.pageSize} OFFSET #{dto.pageNum};
+    </select>
 
 
 </mapper>