合伙人费用展示

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

@@ -143,7 +143,7 @@ public class SysAgencyLeaderController extends BaseController {
     /**
      * 查询所有机构负责人的保费抽成明细
      */
-    @PostMapping("/queryExtractFeeAll")
+    @PostMapping("/queryExtractFeeList")
     @ApiOperation(value = "查询所有机构负责人的保费抽成明细")
     public HttpResult<BasePageResult<AgencyExtractFeeVo>> queryExtractFeeAll(@RequestBody SysAgencyLeaderPageDto sysAgencyLeaderPageDto) {
         if (sysAgencyLeaderPageDto.getPageNum() == 0) {
@@ -155,8 +155,8 @@ public class SysAgencyLeaderController extends BaseController {
         return HttpResult.ok("success", this.sysAgencyLeaderService.queryExtractFeeAll(sysAgencyLeaderPageDto));
     }
 
-    @PostMapping("/queryExtractFeeList")
-    @ApiOperation(value = "查询所有机构负责人的保费抽成明细")
+    @PostMapping("/queryExtractFeeAll")
+    @ApiOperation(value = "优化查询所有机构负责人的保费抽成明细")
     public HttpResult<BasePageResult<AgencyExtractFeeVo>> queryExtractFeeList(@RequestBody SysAgencyLeaderPageDto sysAgencyLeaderPageDto) {
         if (sysAgencyLeaderPageDto.getPageNum() == 0) {
             sysAgencyLeaderPageDto.setPageNum(1);

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

@@ -117,7 +117,7 @@ public class SysPartnerController extends BaseController {
     /**
      * 所有合伙人的抽层费用
      */
-    @PostMapping("/queryPartnerByPage")
+    @PostMapping("/queryPartnerByPages")
     @ApiOperation(value = "所有合伙人的抽层费用信息")
     public HttpResult<BasePageResult<AgencyExtractFeeVo>> queryPartnerByPage(@RequestBody SysPartnerPageDto sysPartnerPageDto) {
         if (sysPartnerPageDto.getPageNum() == 0) {
@@ -128,8 +128,8 @@ public class SysPartnerController extends BaseController {
         }
         return HttpResult.ok(this.sysPartnerService.queryPartnerByPage(sysPartnerPageDto));
     }
-    @PostMapping("/queryPartnerByPages")
-    @ApiOperation(value = "所有合伙人的抽层费用信息")
+    @PostMapping("/queryPartnerByPage")
+    @ApiOperation(value = "优化所有合伙人的抽层费用信息")
     public HttpResult<BasePageResult<AgencyExtractFeeVo>> queryPartnerByPages(@RequestBody SysPartnerPageDto sysPartnerPageDto) {
         if (sysPartnerPageDto.getPageNum() == 0) {
             sysPartnerPageDto.setPageNum(1);
@@ -145,7 +145,7 @@ public class SysPartnerController extends BaseController {
      *
      */
     @PostMapping("/querySysPartnerAPPPage")
-    @ApiOperation(value = "合伙人查看直接合伙人、间接合伙人分页查询")
+    @ApiOperation(value = "APP合伙人查看直接合伙人、间接合伙人分页查询")
     public HttpResult<BasePageResult<SysPartnerAPPPageVo>> SysPartnerAPPPage(@RequestBody SysPartnerAPPPageDto sysPartnerAPPPageDto) {
         if (sysPartnerAPPPageDto.getPageNum() == 0) {
             sysPartnerAPPPageDto.setPageNum(1);

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

@@ -34,6 +34,6 @@ public interface SysAgencyLeaderMapper extends BaseMapper<SysAgencyLeader> {
     IPage<DeptBalanceDto> queryPage(Page page, @Param("vo") DeptBalanceVo deptBalanceVo);
 
 
-    HashMap<String, BigDecimal> getBigDecimalNum(@Param("deptId") String deptId, @Param("createTime")  String createTime);
+    HashMap<String, BigDecimal> getBigDecimalNum(@Param("deptId") String deptId, @Param("createTime")  String createTime,@Param("beginTime") String beginTime,@Param("endTime") String endTime);
 }
 

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

@@ -667,10 +667,12 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
                 String dateStr = "";
                 if (updateTime != null) {
                     dateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(updateTime);
+                    agencyExtractFee.setStartTime(updateTime);
                 } else {
                     dateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(createTime);
+                    agencyExtractFee.setStartTime(createTime);
                 }
-                HashMap<String, BigDecimal> map = baseMapper.getBigDecimalNum(sysAgencyLeaders.getDeptId(), dateStr);
+                HashMap<String, BigDecimal> map = baseMapper.getBigDecimalNum(sysAgencyLeaders.getDeptId(), dateStr,null,null);
                 if (CollectionUtil.isNotEmpty(map)) {
                     bigDecimal = map.get("bigDecimal") == null ? BigDecimal.ZERO : map.get("bigDecimal");
                     agencyExtractFee.setSumpremium(bigDecimal);

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

@@ -415,10 +415,12 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                             String dateStr = "";
                             if (updateTime != null) {
                                 dateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(updateTime);
+                                agencyExtractFee.setStartTime(updateTime);
                             } else {
                                 dateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(createTime);
+                                agencyExtractFee.setStartTime(createTime);
                             }
-                            HashMap<String, BigDecimal> map = sysAgencyLeaderMapper.getBigDecimalNum(sysAgencyLeaders.getDeptId(), dateStr);
+                            HashMap<String, BigDecimal> map = sysAgencyLeaderMapper.getBigDecimalNum(sysAgencyLeaders.getDeptId(), dateStr,null,null);
                             if (CollectionUtil.isNotEmpty(map)) {
                                 bigDecimal = bigDecimal.add(map.get("bigDecimal") == null ? BigDecimal.ZERO : map.get("bigDecimal"));
                             }
@@ -536,38 +538,52 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
 
                                 for (SysDept sysDept1 : sysDeptList) {
 
-                                    List<InsOrders> insOrderList;
+//                                    List<InsOrders> insOrderList;
+//                                    //筛选订单，选择时间
+//                                    Date updateTime = sysAgencyLeader.getUpdateTime();
+//                                    if (updateTime == null) {
+//                                        //机构下所有订单
+//                                        insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
+//                                                .likeRight(InsOrders::getDeptid, sysDept1.getId())
+//                                                .ge(InsOrders::getCreatetime, sysAgencyLeader.getCreateTime()));
+//                                        sysPartnerAPPPageVo.setStartTime(sysAgencyLeader.getCreateTime());
+//
+//                                    } else {
+//                                        insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
+//                                                .likeRight(InsOrders::getDeptid, sysDept1.getId())
+//                                                .ge(InsOrders::getCreatetime, updateTime));
+//                                        sysPartnerAPPPageVo.setStartTime(updateTime);
+//                                    }
+//
+//                                    if (insOrderList.size() > 0) {
+//                                        List<String> collect = insOrderList.stream().map(InsOrders::getOrderno).collect(Collectors.toList());
+//                                        //查询订单下的所有子订单
+//                                        List<InsAreaCompany> insAreaCompanies = insAreaCompanyMapper.selectList(new LambdaQueryWrapper<InsAreaCompany>()
+//                                                .in(InsAreaCompany::getOrderno, collect)
+//                                                .eq(InsAreaCompany::getOrderstatus, 3));
+//                                        if (insAreaCompanies.size() > 0) {
+//                                            BigDecimal jqpremium = insAreaCompanies.stream().map(InsAreaCompany::getJqpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
+//                                            BigDecimal sypremium = insAreaCompanies.stream().map(InsAreaCompany::getSypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
+//                                            BigDecimal jypremium = insAreaCompanies.stream().map(InsAreaCompany::getJypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
+//
+//                                            bigDecimal = jqpremium.add(sypremium).add(jypremium);
+//                                        }
+//                                    }
                                     //筛选订单，选择时间
                                     Date updateTime = sysAgencyLeader.getUpdateTime();
-                                    if (updateTime == null) {
-                                        //机构下所有订单
-                                        insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
-                                                .likeRight(InsOrders::getDeptid, sysDept1.getId())
-                                                .ge(InsOrders::getCreatetime, sysAgencyLeader.getCreateTime()));
-                                        sysPartnerAPPPageVo.setStartTime(sysAgencyLeader.getCreateTime());
-
-                                    } else {
-                                        insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
-                                                .likeRight(InsOrders::getDeptid, sysDept1.getId())
-                                                .ge(InsOrders::getCreatetime, updateTime));
+                                    Date createTime = sysAgencyLeader.getCreateTime();
+                                    String dateStr = "";
+                                    if (updateTime != null) {
+                                        dateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(updateTime);
                                         sysPartnerAPPPageVo.setStartTime(updateTime);
+                                    } else {
+                                        dateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(createTime);
+                                        sysPartnerAPPPageVo.setStartTime(createTime);
                                     }
-
-                                    if (insOrderList.size() > 0) {
-                                        List<String> collect = insOrderList.stream().map(InsOrders::getOrderno).collect(Collectors.toList());
-                                        //查询订单下的所有子订单
-                                        List<InsAreaCompany> insAreaCompanies = insAreaCompanyMapper.selectList(new LambdaQueryWrapper<InsAreaCompany>()
-                                                .in(InsAreaCompany::getOrderno, collect)
-                                                .eq(InsAreaCompany::getOrderstatus, 3));
-                                        if (insAreaCompanies.size() > 0) {
-                                            BigDecimal jqpremium = insAreaCompanies.stream().map(InsAreaCompany::getJqpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-                                            BigDecimal sypremium = insAreaCompanies.stream().map(InsAreaCompany::getSypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-                                            BigDecimal jypremium = insAreaCompanies.stream().map(InsAreaCompany::getJypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-
-                                            bigDecimal = jqpremium.add(sypremium).add(jypremium);
-                                        }
+                                    HashMap<String, BigDecimal> map = sysAgencyLeaderMapper.getBigDecimalNum(sysDept1.getId(), dateStr,null,null);
+                                    if (CollectionUtil.isNotEmpty(map)) {
+                                        bigDecimal = bigDecimal.add(map.get("bigDecimal") == null ? BigDecimal.ZERO : map.get("bigDecimal"));
                                     }
-
                                 }
                             }
                         }

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

@@ -83,6 +83,9 @@
             <if test="createTime  != null  and  createTime !=''">
                 and io.createtime >= #{createTime}
             </if>
+            <if test="beginTime !=null and beginTime != '' and endTime !=null and endTime != ''">
+                AND  io.createtime  BETWEEN  #{beginTime}  AND  #{endTime}
+            </if>
         </where>
 
     </select>