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

src/main/java/com/ydtech/config/scheduledConfig/ScheduledConfig.java

@@ -0,0 +1,17 @@
+package com.ydtech.config.scheduledConfig;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+
+@Configuration
+public class ScheduledConfig {
+    @Bean
+    public ThreadPoolTaskScheduler threadPoolTaskScheduler() {
+        ThreadPoolTaskScheduler threadPoolTaskScheduler = new ThreadPoolTaskScheduler();
+        threadPoolTaskScheduler.setPoolSize(5);
+        threadPoolTaskScheduler.setRemoveOnCancelPolicy(true);
+        return threadPoolTaskScheduler;
+    }
+}
+

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

@@ -135,12 +135,12 @@ public class APPPartnerController extends BaseController {
      */
     @PostMapping("/getCommissionInfo")
     @ApiOperation(value = "总佣金组成明细")
-    public HttpResult<BasePageResult<SysPremiumDetails>> getCommissionInfo(@RequestBody CommissionInfoDto commissionInfoDto) {
+    public HttpResult<BasePageResult<SysPremiumDetailsVo>> getCommissionInfo(@RequestBody CommissionInfoDto commissionInfoDto) {
         if (commissionInfoDto.getPageNum() == 0) {
             commissionInfoDto.setPageNum(1);
         }
         if (commissionInfoDto.getPageSize() == 0) {
-            commissionInfoDto.setPageSize(10);
+            commissionInfoDto.setPageSize(20);
         }
 
         return HttpResult.ok("success",this.sysPartnerService.getCommissionInfo(commissionInfoDto));
@@ -218,7 +218,7 @@ public class APPPartnerController extends BaseController {
      */
     @PostMapping("/getLevelPartnerInfo")
     @ApiOperation(value = "排行榜->查看详情")
-    public HttpResult<PartnerInfoFreeVo> getLevelPartnerInfo(@RequestBody List<String> partnerIds) {
+    public HttpResult<List<LevelPartnerInfoVo>> getLevelPartnerInfo(@RequestBody List<String> partnerIds) {
 
         return HttpResult.ok("success",this.sysPartnerService.getLevelPartnerInfo(partnerIds));
     }

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

@@ -230,7 +230,10 @@ public class SysLoginController {
                 throw new SystemException("该用户未授权");
             }
         }
-        user.setIsLock(0);
+        SysUser sysUser = sysUserService.getByUserId(user.getId());
+        if ("2".equals(sysUser.getManagementSource())){
+            user.setIsLock(0);
+        }
         //验证用户
         SysUser.verifyUser(user);
         SysPassword sysPassword = sysPasswordService.getOne(new LambdaQueryWrapper<SysPassword>().eq(SysPassword::getCode, SysPasswordEnum.GENERAL.getCode()));
@@ -396,7 +399,10 @@ public class SysLoginController {
         String phoneMsg = phoneLoginVo.getPhoneMsg();
         SysUser user = sysUserService.findByPhone(phone);
         //验证用户
-        user.setIsLock(0);
+        SysUser sysUser = sysUserService.getByUserId(user.getId());
+        if ("2".equals(sysUser.getManagementSource())){
+            user.setIsLock(0);
+        }
         SysUser.verifyUser(user);
         String msg = redisTemplate.opsForValue().get(PHONE_VERIFICATION_CODE_KEY + phone);
         if (msg == null || msg.isEmpty()) {

src/main/java/com/ydtech/modules/admin/controller/taskStatistics/TaskStatisticsController.java

@@ -2,12 +2,10 @@ package com.ydtech.modules.admin.controller.taskStatistics;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.pagehelper.PageInfo;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.dto.TaskStatisticsDto;
 import com.ydtech.modules.admin.model.dto.TaskStatisticsDtoNew;
 import com.ydtech.modules.admin.model.vo.BusinessAgentData;
-import com.ydtech.modules.admin.model.vo.BusinessOrderData;
 import com.ydtech.modules.admin.model.vo.KztGetDeptUtilsDto;
 import com.ydtech.modules.admin.model.vo.TaskStatisticsVo;
 import com.ydtech.modules.admin.service.TaskStatisticsService;
@@ -474,37 +472,4 @@ public class TaskStatisticsController {
         }
     }
 
-
-    /**
-     * @description:   任控制台-业务数据-渠道-详情
-     * @author: hh
-     * @date: 2024/11/19
-     **/
-    @PostMapping("getBusinessOrderDataDetails")
-    @ApiOperation(value = "控制台-业务数据-渠道-订单详情-详情")
-    public HttpResult<PageInfo<BusinessOrderData>> getBusinessOrderDataDetails(@RequestBody TaskStatisticsVo taskStatisticsVo) {
-        try {
-            PageInfo<BusinessOrderData> businessOrderDataDetails = taskStatisticsService.getBusinessOrderDataDetails(taskStatisticsVo);
-            return HttpResult.ok("查询数据成功", businessOrderDataDetails);
-        } catch (Exception e) {
-            return HttpResult.error("查询错误"+e.getMessage());
-        }
-    }
-
-    /**
-     * @description:   控制台-业务数据-渠道-订单详情-合计
-     * @author: hh
-     * @date: 2024/11/19
-     **/
-    @PostMapping("getBusinessOrderDataTotal")
-    @ApiOperation(value = "控制台-业务数据-渠道-订单详情-合计")
-    public HttpResult<BusinessOrderData> getBusinessOrderDataTotal(@RequestBody TaskStatisticsVo taskStatisticsVo) {
-        try {
-            BusinessOrderData result = taskStatisticsService.getBusinessOrderDataTotal(taskStatisticsVo);
-            return HttpResult.ok("查询数据成功", result);
-        } catch (Exception e) {
-            return HttpResult.error("查询错误"+e.getMessage());
-        }
-    }
-
 }

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

@@ -35,8 +35,10 @@ public interface SysPartnerMapper extends BaseMapper<SysPartner> {
      *  @Description:  机构树形
      */
     List<SysPartnerConsoleDto> getTreeDeptUser(PartnerBalanceVo partnerBalanceVo);
-
+    //直接
     List<SysPartner> queryByLoginId(@Param("userId") String userId);
+    //间接
+    List<SysPartner> queryIndirectByLoginId(@Param("userId") String userId);
 
     List<CountUserNumVo> queryDeptByTime(@Param("deptIds") List<String> deptIds, @Param("dto") CountUserDto countUserDto);
     List<CountUserNumVo> queryDeptByTimes(@Param("deptIds") List<String> deptIds, @Param("dto") CountUserDto countUserDto);

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

@@ -2,6 +2,7 @@ package com.ydtech.modules.admin.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.po.SysUserBankCard;
 import com.ydtech.modules.admin.model.po.SysUserBankCardHistory;
 import com.ydtech.modules.admin.model.vo.SysUserBankCardVO;
@@ -30,22 +31,16 @@ public interface SysUserBankCardMapper extends BaseMapper<SysUserBankCard> {
     List<SysUserBankCardHistory> getUserBankCardHistoryList(@Param("sysUserBankCardHistory") SysUserBankCardHistory sysUserBankCardHistory);
 
     @Select("SELECT " +
-            "  u.mobile, " +
-            "  u.identity, " +
-            "  u.identity_time, " +
-            "  b.real_user_name AS user_name, " +
-            "  b.user_id, " +
-            "  b.bank_number, " +
-            "  d.management_source " +
+            " u.mobile,u.id, " +
+            " u.identity, " +
+            " u.identity_time, " +
+            " u.`name`, " +
+            " d.management_source  " +
             " FROM " +
-            "  sys_user_bank_card b " +
-            "  INNER JOIN sys_user u ON u.id = b.user_id " +
-            "  INNER JOIN sys_dept d ON u.dept_id = d.id " +
-            "   " +
-            " WHERE " +
-            "  b.is_default = 1  " +
-            "  AND b.user_id = #{userId}")
-    SysUserBankCard selectByIdPay(@Param("userId") String userId);
+            " sys_user u " +
+            " INNER JOIN sys_dept d ON u.dept_id = d.id " +
+            " WHERE u.id = #{userId}")
+    SysUser selectByIdPay(@Param("userId") String userId);
 }
 
 

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.vo.BusinessAgentData;
-import com.ydtech.modules.admin.model.vo.BusinessOrderData;
 import com.ydtech.modules.admin.model.vo.TaskStatisticsVo;
 import org.apache.ibatis.annotations.Mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -40,19 +39,4 @@ public interface TaskStatisticsMapper extends BaseMapper<TaskStatisticsDto> {
      */
     IPage<TaskStatisticsDto> channelAgentDetails(Page page, TaskStatisticsVo taskStatisticsVo);
 
-
-    /**
-     * @description:   任控制台-业务数据-渠道-订单详情
-     * @author: hh
-     * @date: 2024/09/10
-     **/
-    List<BusinessOrderData> getBusinessOrderDataDetails(@Param("vo") TaskStatisticsVo taskStatisticsVo);
-
-    /**
-     * @description:   任控制台-业务数据-渠道-订单详情总和
-     * @author: hh
-     * @date: 2024/09/10
-     **/
-    BusinessOrderData getBusinessOrderDataTotal(@Param("vo") TaskStatisticsVo taskStatisticsVo);
-
 }

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

@@ -15,4 +15,6 @@ public class PartnerInfoDto {
 
     @ApiModelProperty(value = "等级 1一级；2二级；3级")
     private Integer partnerType;
+    @ApiModelProperty(value = "用户ID")
+    private String userId;
 }

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

@@ -34,9 +34,6 @@ public class AppSysPartnerVo {
     @ApiModelProperty(value = "团队总人数")
     private Integer TeamManNum;
 
-    @ApiModelProperty(value = "合伙人+工作室数量")
-    private Integer number;
-
     @ApiModelProperty(value = "工作室数量")
     private Integer workNumber;
     //二级以下使用

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

@@ -87,9 +87,6 @@ public class BusinessAgentData {
     @ApiModelProperty(value = "毛利润占比")
     private BigDecimal distributionAmountRate;
 
-    @ApiModelProperty(value = "毛利润率")
-    private String grossMargin;
-
     @ApiModelProperty(value = "入口金额")
     private BigDecimal entranceAllFee;
 

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

@@ -1,62 +0,0 @@
-package com.ydtech.modules.admin.model.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-
-@Data
-@ApiModel("业务数据-渠道-详情")
-public class BusinessOrderData {
-
-
-    @ApiModelProperty(value = "姓名")
-    private String userName;
-
-    @ApiModelProperty(value = "工号")
-    private String userId;
-
-    @ApiModelProperty(value = "订单号")
-    private String orderNo;
-
-    @ApiModelProperty(value = "车牌号")
-    private String carNum;
-
-    @ApiModelProperty(value = "签单保费")
-    private BigDecimal sumPremium;
-
-    @ApiModelProperty(value = "交强险保费")
-    private BigDecimal jqPremium;
-
-    @ApiModelProperty(value = "车船税")
-    private BigDecimal taxAmount;
-
-    @ApiModelProperty(value = "商业险保费")
-    private BigDecimal syPremium;
-
-    @ApiModelProperty(value = "非车险保费")
-    private BigDecimal jyPremium;
-
-    @ApiModelProperty(value = "签单保费占比")
-    private BigDecimal sumPremiumProportion;
-
-    @ApiModelProperty(value = "总人数")
-    private String totalNumber;
-
-    @ApiModelProperty(value = "毛利润")
-    private BigDecimal distributionAmount;
-
-    @ApiModelProperty(value = "毛利润占比")
-    private BigDecimal distributionAmountRate;
-
-    @ApiModelProperty(value = "毛利润率")
-    private String grossMargin;
-
-    @ApiModelProperty(value = "入口金额")
-    private BigDecimal entranceAllFee;
-
-    @ApiModelProperty(value = "出口金额")
-    private BigDecimal exportAllFee;
-}

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

@@ -0,0 +1,20 @@
+package com.ydtech.modules.admin.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class LevelPartnerInfoVo {
+
+    @ApiModelProperty(value = "用户Id")
+    private String userId;
+
+    @ApiModelProperty(value = "用户名称")
+    private String userName;
+
+    @ApiModelProperty(value = "用户等级")
+    private Integer level;
+
+    @ApiModelProperty(value = "人数")
+    private int deptManNum;
+}

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

@@ -119,11 +119,4 @@ 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/model/vo/TaskStatisticsVo.java

@@ -152,15 +152,4 @@ public class TaskStatisticsVo implements Serializable {
     @ApiModelProperty(value = "对接人")
     private String dockingPerson;
 
-    @ApiModelProperty(value = "筛选签单开始时间")
-    private String signingTimeStart;
-
-    @ApiModelProperty(value = "筛选签单结束时间")
-    private String signingTimeEnd;
-
-    @ApiModelProperty(value = "筛选录单开始时间")
-    private String enterTimeStart;
-
-    @ApiModelProperty(value = "筛选录单开始时间")
-    private String enterTimeEnd;
 }

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

@@ -55,7 +55,7 @@ public interface SysPartnerService extends IService<SysPartner> {
 
     PartnerInfoFreeVo queryPartnerInfo(PartnerGradeInfo partnerGradeInfo);
 
-    BasePageResult<SysPremiumDetails> getCommissionInfo(CommissionInfoDto commissionInfoDto);
+    BasePageResult<SysPremiumDetailsVo> getCommissionInfo(CommissionInfoDto commissionInfoDto);
 
     List<SysPremiumDetailsVo> getCommissionInfos(CommissionInfoDto commissionInfoDto);
 
@@ -88,5 +88,5 @@ public interface SysPartnerService extends IService<SysPartner> {
 
     String checkBindWechat();
 
-    PartnerInfoFreeVo getLevelPartnerInfo(List<String> partnerIds);
+    List<LevelPartnerInfoVo> getLevelPartnerInfo(List<String> partnerIds);
 }

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

@@ -1,12 +1,10 @@
 package com.ydtech.modules.admin.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.pagehelper.PageInfo;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.dto.TaskStatisticsDto;
 import com.ydtech.modules.admin.model.dto.TaskStatisticsDtoNew;
 import com.ydtech.modules.admin.model.vo.BusinessAgentData;
-import com.ydtech.modules.admin.model.vo.BusinessOrderData;
 import com.ydtech.modules.admin.model.vo.TaskStatisticsVo;
 import com.ydtech.modules.order.entity.BasePageResult;
 
@@ -144,19 +142,4 @@ public interface TaskStatisticsService {
      **/
     HttpResult electricExcel(TaskStatisticsVo taskStatisticsVo);
 
-
-    /**
-     * @description:   任控制台-业务数据-渠道-详情
-     * @author: hh
-     * @date: 2024/11/19
-     **/
-    PageInfo<BusinessOrderData> getBusinessOrderDataDetails(TaskStatisticsVo taskStatisticsVo);
-
-    /**
-     * @description:   控制台-业务数据-渠道-订单详情-合计
-     * @author: hh
-     * @date: 2024/11/19
-     **/
-    BusinessOrderData getBusinessOrderDataTotal(TaskStatisticsVo taskStatisticsVo);
-
 }

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

@@ -139,20 +139,21 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
             //插入轨迹表
             SysAmountAuditingHistory sysAmountAuditingHistory =new SysAmountAuditingHistory(null, sysAmountAuditingEntity.getId(), amount, userId,new Date(),"4", "1",sysUserAccountHistory.getId());
             sysAmountAuditingHistoryService.save(sysAmountAuditingHistory);
+            sendLgParams(sysAmountAuditingEntity,sysAmountAuditingHistory.getAuditingStatus());
         }
     }
 
 
-    public void sendLgParams(SysAmountAuditingHistory sysAmountAuditingHistory,SysAmountAuditingEntity sysAmountAuditingEntity){
+    public void sendLgParams(SysAmountAuditingEntity sysAmountAuditingEntity,String auditingStatus){
         PushLgEntity lgEntity = new PushLgEntity();
         lgEntity.setApplicationTime(new Date());
         lgEntity.setBusinessUmber(sysAmountAuditingEntity.getId());
         lgEntity.setPayee(sysAmountAuditingEntity.getUserName());
         lgEntity.setPayeeId(String.valueOf(sysAmountAuditingEntity.getUserId()));
         lgEntity.setReceivingAccount(sysAmountAuditingEntity.getBankNumber());
-        lgEntity.setExtractMoney(sysAmountAuditingHistory.getAmount());
+        lgEntity.setExtractMoney(sysAmountAuditingEntity.getAmount());
         lgEntity.setServiceCharge(null);
-        lgEntity.setExtractStatus(sysAmountAuditingHistory.getAuditingStatus());
+        lgEntity.setExtractStatus(auditingStatus);
         pushLgEntityService.sendLgData(lgEntity);
     }
 

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

@@ -88,9 +88,6 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
 
     @Resource
     private SysPremiumDetailsService sysPremiumDetailsService;
-
-    @Resource
-    private SysUserAccountHistoryMapper sysUserAccountHistoryMapper;
     @Resource
     private SysPartnerConfigMapper sysPartnerConfigMapper;
 
@@ -659,7 +656,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
     @Override
     public APPPartnerInfoFreeVo getTeamInfo(PartnerGradeInfo partnerGradeInfo) {
         APPPartnerInfoFreeVo appPartnerInfoFreeVo = new APPPartnerInfoFreeVo();
-
+        String loginId = BaseController.getUserId();
         List<APPPartnerInfo> appPartnerInfoList = new ArrayList<>();
 
         List<String> deptIds = partnerGradeInfo.getDeptIds();
@@ -704,26 +701,29 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
             }
             appPartnerInfo.setTeamManNum(deptManNum);
             appPartnerInfo.setUserIds(userIdList);
+            BigDecimal sumPremium = BigDecimal.ZERO;
+            BigDecimal extractFee = BigDecimal.ZERO;
             if (CollectionUtil.isEmpty(userIdList)) continue;
-            //查团队的保费
-            List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
-                    .in(SysPremiumDetails::getUserId, userIdList)
-                    .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 sumPremium = sysPremiumDetails.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-            appPartnerInfo.setSumPremium(sumPremium);
+            for (String userId : userIdList) {
+                //查团队的保费
+                List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
+                        .eq(SysPremiumDetails::getIssuerId, userId)
+                        .eq(SysPremiumDetails::getUserId, loginId)
+                        .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 (sysPremiumDetails.size() > 0) {
+                    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);
+                }
 
-            List<SysUserAccountHistory> sysUserAccountHistories = sysUserAccountHistoryMapper.selectList(new LambdaQueryWrapper<SysUserAccountHistory>()
-                    .in(SysUserAccountHistory::getUserId, userIdList).eq(SysUserAccountHistory::getProperty, 3));
-            if (CollectionUtil.isNotEmpty(sysUserAccountHistories)) {
-                BigDecimal extractFee = sysUserAccountHistories.stream().map(SysUserAccountHistory::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
-                appPartnerInfo.setExtractFee(extractFee);
-            } else {
-                appPartnerInfo.setExtractFee(BigDecimal.ZERO);
             }
 
+            appPartnerInfo.setSumPremium(sumPremium);
+            appPartnerInfo.setExtractFee(extractFee);
             appPartnerInfoList.add(appPartnerInfo);
         }
         List<String> ids = new ArrayList<>();
@@ -734,25 +734,29 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
             }
         }
         if (CollectionUtil.isEmpty(ids)) return appPartnerInfoFreeVo;
+        BigDecimal sumPremium1 = BigDecimal.ZERO;
+        BigDecimal extractFee1 = BigDecimal.ZERO;
+        for (String id : ids) {
 
-        List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
-                .in(SysPremiumDetails::getUserId, ids)
-                .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 sumPremium = sysPremiumDetails.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-        appPartnerInfoFreeVo.setSumPremium(sumPremium);
+            List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
+                    .eq(SysPremiumDetails::getIssuerId, id)
+                    .eq(SysPremiumDetails::getUserId, loginId)
+                    .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 (sysPremiumDetails.size() > 0) {
+                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);
+            }
 
-        List<SysUserAccountHistory> sysUserAccountHistories = sysUserAccountHistoryMapper.selectList(new LambdaQueryWrapper<SysUserAccountHistory>()
-                .in(SysUserAccountHistory::getUserId, ids).eq(SysUserAccountHistory::getProperty, 3));
-        if (CollectionUtil.isNotEmpty(sysUserAccountHistories)) {
-            BigDecimal extractFee = sysUserAccountHistories.stream().map(SysUserAccountHistory::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
-            appPartnerInfoFreeVo.setExtractFee(extractFee);
-        } else {
-            appPartnerInfoFreeVo.setExtractFee(BigDecimal.ZERO);
         }
 
+        appPartnerInfoFreeVo.setSumPremium(sumPremium1);
+        appPartnerInfoFreeVo.setExtractFee(extractFee1);
+
         int sum = appPartnerInfoList.stream().mapToInt(APPPartnerInfo::getTeamManNum).sum();
         appPartnerInfoFreeVo.setTeamManNum(sum);
 
@@ -773,10 +777,11 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
             appPartnerNumVo.setExtractFee(sysPartnerAccount.getExtractFee());
         }
         if (type == 1) {
-            //下面合伙人（直接+间接）数量
+            //下面合伙人（直接）数量
             List<SysRelationPerson> sysRelationPersonList1 = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
                     .eq(SysRelationPerson::getSuggestId, userId)
                     .eq(SysRelationPerson::getDelFlag, 1)
+                    .eq(SysRelationPerson::getSource, 0)
                     .eq(SysRelationPerson::getType, 0));
 
             appPartnerNumVo.setPartnerNum(sysRelationPersonList1.size());
@@ -888,87 +893,100 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
     }
 
     @Override
-    public List<AppSysPartnerVo> partnerInfo(PartnerInfoDto partnerInfoDto) {
+    public List<AppSysPartnerVo>  partnerInfo(PartnerInfoDto partnerInfoDto) {
         List<AppSysPartnerVo> appSysPartnerVos = new ArrayList<>();
-        String userId = BaseController.getUserId();
+        String userId = partnerInfoDto.getUserId();
+        if (StringUtils.isEmpty(userId)) {
+            userId = BaseController.getUserId();
+        }
         SysPartner sysPartner = sysPartnerMapper.selectOne(new LambdaQueryWrapper<SysPartner>()
                 .eq(SysPartner::getUserId, userId).eq(SysPartner::getDelFlag, 1));
-        //查询登陆人下所有合伙人
+        //查询登陆人下所有直接合伙人
         List<SysPartner> sysPartnerList = sysPartnerMapper.queryByLoginId(userId);
 
         Map<Integer, List<SysPartner>> listMap = sysPartnerList.stream().sorted(Comparator.comparing(SysPartner::getId))
                 .collect(Collectors.groupingBy(SysPartner::getType));
         //按等级查询
-        Integer partnerType = partnerInfoDto.getPartnerType();
-        if (partnerType != null) {
-            List<SysPartner> sysPartnerList1 = listMap.get(partnerType + sysPartner.getType());
-
-            if (sysPartnerList1 != null) {
-                AppSysPartnerVo appSysPartnerVo = new AppSysPartnerVo();
-                appSysPartnerVo.setPartnerType(partnerType + sysPartner.getType());
-                //下级合伙人数
-                appSysPartnerVo.setPartnerNumber(sysPartnerList1.size());
-                List<String> ids = sysPartnerList1.stream().map(SysPartner::getUserId).collect(Collectors.toList());
-                appSysPartnerVo.setPartnerIds(ids);
-                List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
-                        .in(CollectionUtil.isNotEmpty(ids), SysPremiumDetails::getUserId, ids)
-                        .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);
-
-                appSysPartnerVo.setSumPremium(sumPremium);
-                appSysPartnerVo.setExtractFee(extractFee);
-                //二级以下团队的总人数
-                List<SysRelationPerson> sysRelationPersonList = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
-                        .in(CollectionUtil.isNotEmpty(ids), SysRelationPerson::getSuggestId, ids)
-                        .eq(SysRelationPerson::getDelFlag, 1)
-                        .eq(SysRelationPerson::getType, 1));
-                int deptManNum = 0;
-                if (sysRelationPersonList.size() > 0) {
-                    List<String> idList = sysRelationPersonList.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
-                    List<SysAgencyLeader> leaderList = sysAgencyLeaderMapper.selectList(new LambdaQueryWrapper<SysAgencyLeader>()
-                            .in(CollectionUtil.isNotEmpty(idList), SysAgencyLeader::getUserId, idList).eq(SysAgencyLeader::getDelFlag, 1));
-                    if (leaderList.size() > 0) {
-                        for (SysAgencyLeader sysAgencyLeader : leaderList) {
-                            //获取机构下的团队
-                            List<SysDept> sysDeptList = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>()
-                                    .likeRight(SysDept::getId, sysAgencyLeader.getDeptId())
-                                    .isNull(SysDept::getComlevel).eq(SysDept::getDelFlag, 0)
-                                    .eq(SysDept::getManagementSource, sysAgencyLeader.getSource()));
-                            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));
-                                    deptManNum = deptManNum + sysUsers.size();
-
-                                }
-                            }
-                        }
-                    }
-                }
-                appSysPartnerVo.setTeamManNum(deptManNum);
-                List<SysRelationPerson> sysRelationPersons = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
-                        .in(CollectionUtil.isNotEmpty(ids), SysRelationPerson::getSuggestId, ids)
-                        .eq(SysRelationPerson::getDelFlag, 1)
-                        .eq(SysRelationPerson::getSource, 0)
-                        .eq(SysRelationPerson::getType, 1));
-                appSysPartnerVo.setWorkNumber(sysRelationPersons.size());
-                if (sysRelationPersons.size() > 0) {
-                    List<String> list1 = sysRelationPersons.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
-                    appSysPartnerVo.setLeaderIds(list1);
-                }
-
-                //每一级存入map
-
-                appSysPartnerVos.add(appSysPartnerVo);
-            }
-
-            return appSysPartnerVos;
-
-        }
+//        Integer partnerType = partnerInfoDto.getPartnerType();
+//        if (partnerType != null) {
+//            List<SysPartner> sysPartnerList1 = listMap.get(partnerType + sysPartner.getType());
+//
+//            if (sysPartnerList1 != null) {
+//                AppSysPartnerVo appSysPartnerVo = new AppSysPartnerVo();
+//                appSysPartnerVo.setPartnerType(partnerType + sysPartner.getType());
+//                //下级合伙人数
+//                appSysPartnerVo.setPartnerNumber(sysPartnerList1.size());
+//                List<String> ids = sysPartnerList1.stream().map(SysPartner::getUserId).collect(Collectors.toList());
+//                appSysPartnerVo.setPartnerIds(ids);
+//                List<String> userIds = new ArrayList<>();
+//                //二级以下团队的总人数
+//                List<SysRelationPerson> sysRelationPersonList = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
+//                        .in(CollectionUtil.isNotEmpty(ids), SysRelationPerson::getSuggestId, ids)
+//                        .eq(SysRelationPerson::getDelFlag, 1)
+//                        .eq(SysRelationPerson::getType, 1));
+//                int deptManNum = 0;
+//                if (sysRelationPersonList.size() > 0) {
+//                    List<String> idList = sysRelationPersonList.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
+//                    List<SysAgencyLeader> leaderList = sysAgencyLeaderMapper.selectList(new LambdaQueryWrapper<SysAgencyLeader>()
+//                            .in(CollectionUtil.isNotEmpty(idList), SysAgencyLeader::getUserId, idList).eq(SysAgencyLeader::getDelFlag, 1));
+//                    if (leaderList.size() > 0) {
+//                        for (SysAgencyLeader sysAgencyLeader : leaderList) {
+//                            //获取机构下的团队
+//                            List<SysDept> sysDeptList = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>()
+//                                    .likeRight(SysDept::getId, sysAgencyLeader.getDeptId())
+//                                    .isNull(SysDept::getComlevel).eq(SysDept::getDelFlag, 0)
+//                                    .eq(SysDept::getManagementSource, sysAgencyLeader.getSource()));
+//                            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));
+//                                    deptManNum = deptManNum + sysUsers.size();
+//                                    if (sysUsers.size() >0) {
+//                                        userIds.addAll(sysUsers.stream().map(SysUser::getId).collect(Collectors.toList()));
+//                                    }
+//                                }
+//                            }
+//                        }
+//                    }
+//                }
+//                appSysPartnerVo.setTeamManNum(deptManNum);
+//                if (CollectionUtil.isNotEmpty(userIds)) {
+//                    List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
+//                            .eq(SysPremiumDetails::getUserId, userId)
+//                            .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);
+//
+//                    appSysPartnerVo.setSumPremium(sumPremium);
+//                    appSysPartnerVo.setExtractFee(extractFee);
+//                }else {
+//                    appSysPartnerVo.setSumPremium(BigDecimal.ZERO);
+//                    appSysPartnerVo.setExtractFee(BigDecimal.ZERO);
+//                }
+//
+//                List<SysRelationPerson> sysRelationPersons = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
+//                        .in(CollectionUtil.isNotEmpty(ids), SysRelationPerson::getSuggestId, ids)
+//                        .eq(SysRelationPerson::getDelFlag, 1)
+//                        .eq(SysRelationPerson::getSource, 0)
+//                        .eq(SysRelationPerson::getType, 1));
+//                appSysPartnerVo.setWorkNumber(sysRelationPersons.size());
+//                if (sysRelationPersons.size() > 0) {
+//                    List<String> list1 = sysRelationPersons.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
+//                    appSysPartnerVo.setLeaderIds(list1);
+//                }
+//
+//                //每一级存入map
+//
+//                appSysPartnerVos.add(appSysPartnerVo);
+//            }
+//
+//            return appSysPartnerVos;
+//
+//        }
         int start = 0;
         int type = sysPartner.getType();
         if (type == 1) {
@@ -991,17 +1009,8 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                 appSysPartnerVo.setPartnerNumber(sysPartnerList1.size());
                 List<String> ids = sysPartnerList1.stream().map(SysPartner::getUserId).collect(Collectors.toList());
                 appSysPartnerVo.setPartnerIds(ids);
-                List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
-                        .in(CollectionUtil.isNotEmpty(ids), SysPremiumDetails::getUserId, ids)
-                        .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);
-                appSysPartnerVo.setSumPremium(sumPremium);
-                appSysPartnerVo.setExtractFee(extractFee);
-                //同等级合伙人团队的总人数：
+
+                //所有创造利益总人数
                 List<SysRelationPerson> sysRelationPersonList = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
                         .in(CollectionUtil.isNotEmpty(ids), SysRelationPerson::getSuggestId, ids)
                         .eq(SysRelationPerson::getDelFlag, 1)
@@ -1010,7 +1019,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                 if (sysRelationPersonList.size() > 0) {
                     List<String> idList = sysRelationPersonList.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
                     List<SysAgencyLeader> leaderList = sysAgencyLeaderMapper.selectList(new LambdaQueryWrapper<SysAgencyLeader>()
-                            .in(CollectionUtil.isNotEmpty(idList), SysAgencyLeader::getUserId, idList).eq(SysAgencyLeader::getDelFlag, 1));
+                            .in(SysAgencyLeader::getUserId, idList).eq(SysAgencyLeader::getDelFlag, 1));
                     if (leaderList.size() > 0) {
                         for (SysAgencyLeader sysAgencyLeader : leaderList) {
                             //获取机构下的团队
@@ -1023,14 +1032,14 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                                     List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
                                             .likeRight(SysUser::getId, sysDept.getId()).ne(SysUser::getStatus, 0));
                                     deptManNum = deptManNum + sysUsers.size();
-
                                 }
                             }
                         }
                     }
+
                 }
                 appSysPartnerVo.setTeamManNum(deptManNum);
-
+                //直接工作室
                 List<SysRelationPerson> sysRelationPersons = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
                         .in(CollectionUtil.isNotEmpty(ids), SysRelationPerson::getSuggestId, ids)
                         .eq(SysRelationPerson::getDelFlag, 1)
@@ -1041,6 +1050,26 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                     List<String> list1 = sysRelationPersons.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
                     appSysPartnerVo.setLeaderIds(list1);
                 }
+                //直接工作室下所有的人
+                List<String> userIds = getUserIds(sysRelationPersons);
+
+                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);
+
+                    appSysPartnerVo.setSumPremium(sumPremium);
+                    appSysPartnerVo.setExtractFee(extractFee);
+                }else {
+                    appSysPartnerVo.setSumPremium(BigDecimal.ZERO);
+                    appSysPartnerVo.setExtractFee(BigDecimal.ZERO);
+                }
                 //每一级存入map
                 appSysPartnerVos.add(appSysPartnerVo);
             }
@@ -1048,10 +1077,63 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         return appSysPartnerVos;
     }
 
+    private List<String> getUserIds(List<SysRelationPerson> sysRelationPersons) {
+        List<String> userIds = new ArrayList<>();
+        if (sysRelationPersons.size() > 0) {
+            List<String> idList = sysRelationPersons.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
+            List<SysAgencyLeader> leaderList = sysAgencyLeaderMapper.selectList(new LambdaQueryWrapper<SysAgencyLeader>()
+                    .in(CollectionUtil.isNotEmpty(idList), SysAgencyLeader::getUserId, idList).eq(SysAgencyLeader::getDelFlag, 1));
+            if (leaderList.size() > 0) {
+                for (SysAgencyLeader sysAgencyLeader : leaderList) {
+                    //获取机构下的团队
+                    List<SysDept> sysDeptList = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>()
+                            .likeRight(SysDept::getId, sysAgencyLeader.getDeptId())
+                            .isNull(SysDept::getComlevel).eq(SysDept::getDelFlag, 0)
+                            .eq(SysDept::getManagementSource, sysAgencyLeader.getSource()));
+                    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));
+                            if (sysUsers.size()>0) {
+                                userIds.addAll(sysUsers.stream().map(SysUser::getId).collect(Collectors.toList()));
+                            }
+                        }
+                    }
+                }
+            }
+
+        }
+        return userIds;
+    }
+
+    private List<String> getUserIdByLeader(List<SysAgencyLeader> leaderList) {
+        List<String> userIds = new ArrayList<>();
+        if (leaderList.size() > 0) {
+            for (SysAgencyLeader sysAgencyLeader : leaderList) {
+                //获取机构下的团队
+                List<SysDept> sysDeptList = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>()
+                        .likeRight(SysDept::getId, sysAgencyLeader.getDeptId())
+                        .isNull(SysDept::getComlevel).eq(SysDept::getDelFlag, 0)
+                        .eq(SysDept::getManagementSource, sysAgencyLeader.getSource()));
+                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));
+                        if (sysUsers.size()>0) {
+                            userIds.addAll(sysUsers.stream().map(SysUser::getId).collect(Collectors.toList()));
+                        }
+                    }
+                }
+            }
+        }
+        return userIds;
+    }
+
     @Override
     public PartnerInfoFreeVo queryPartnerInfo(PartnerGradeInfo partnerGradeInfo) {
         PartnerInfoFreeVo partnerInfoFreeVo = new PartnerInfoFreeVo();
         List<PartnerInfoVo> partnerInfoVoList = new ArrayList<>();
+        String loginId = BaseController.getUserId();
         //合伙人：1；工作室：2
         Integer type = partnerGradeInfo.getType();
         if (type == 1) {
@@ -1059,17 +1141,32 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
             if (CollectionUtil.isEmpty(partnerIds)) {
                 return partnerInfoFreeVo;
             }
-            //费用
-            List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
-                    .in(SysPremiumDetails::getUserId, partnerIds)
-                    .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);
+            //合伙人的直接工作室贡献的费用
+            List<SysRelationPerson> sysRelationPersons = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
+                    .in(SysRelationPerson::getSuggestId, partnerIds)
+                    .eq(SysRelationPerson::getDelFlag, 1)
+                    .eq(SysRelationPerson::getSource, 0)
+                    .eq(SysRelationPerson::getType, 1));
+            //直接工作室下所有的人
+            List<String> userIds = getUserIds(sysRelationPersons);
+
+            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);
+            }
 
             //合伙人
             List<SysPartner> sysPartnerList = sysPartnerMapper.selectList(new LambdaQueryWrapper<SysPartner>()
@@ -1077,24 +1174,13 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
             if (sysPartnerList.size() > 0) {
                 for (SysPartner sysPartner : sysPartnerList) {
                     PartnerInfoVo partnerInfoVo = new PartnerInfoVo();
-                    partnerInfoVo.setLevel(partnerGradeInfo.getLevel());
+                    partnerInfoVo.setLevel(sysPartner.getType());
                     String userId = sysPartner.getUserId();
                     partnerInfoVo.setUserId(userId);
                     SysUser sysUser = sysUserMapper.selectById(userId);
                     partnerInfoVo.setUserName(sysUser.getName());
                     SysUser sysUser1 = sysUserMapper.selectById(sysPartner.getSuggestId());
                     partnerInfoVo.setSuggestName(sysUser1.getName());
-                    //费用
-                    List<SysPremiumDetails> sysPremiumDetail = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
-                            .eq(SysPremiumDetails::getUserId, userId)
-                            .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);
                     //直接合伙人
                     List<SysRelationPerson> sysRelationPersonList = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
                             .eq(SysRelationPerson::getSuggestId, userId)
@@ -1116,6 +1202,26 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                     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)
@@ -1228,23 +1334,74 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
     }
 
     @Override
-    public BasePageResult<SysPremiumDetails> getCommissionInfo(CommissionInfoDto commissionInfoDto) {
+    public BasePageResult<SysPremiumDetailsVo> getCommissionInfo(CommissionInfoDto commissionInfoDto) {
+        List<SysPremiumDetailsVo> list = new ArrayList<>();
         String userId = BaseController.getUserId();
 
         Page<SysPremiumDetails> page = new Page<>(commissionInfoDto.getPageNum(), commissionInfoDto.getPageSize());
 
-        LambdaQueryWrapper<SysPremiumDetails> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(SysPremiumDetails::getUserId, userId);
-        wrapper.eq(commissionInfoDto.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, commissionInfoDto.getIndustrySector());
-        wrapper.between(StringUtils.isNotEmpty(commissionInfoDto.getBeginTime()) && StringUtils.isNotEmpty(commissionInfoDto.getEndTime()),
-                SysPremiumDetails::getCreateTime, commissionInfoDto.getBeginTime(), commissionInfoDto.getEndTime());
-        wrapper.orderByDesc(SysPremiumDetails::getId);
+        List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
+                .eq(SysPremiumDetails::getUserId, userId)
+                .eq(commissionInfoDto.getIndustrySector() != 0, SysPremiumDetails::getIndustrySector, commissionInfoDto.getIndustrySector())
+                .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,
+                list);
+        Map<String, List<SysPremiumDetails>> listMap = sysPremiumDetails.stream().sorted(Comparator.comparing(SysPremiumDetails::getId))
+                .collect(Collectors.groupingBy(SysPremiumDetails::getCompanyId));
+        for (String key : listMap.keySet()) {
+            List<SysPremiumInfoVo> proportionList = new ArrayList<>();
+            SysPremiumDetailsVo sysPremiumDetailsVo = new SysPremiumDetailsVo();
+            sysPremiumDetailsVo.setCompanyId(key);
+            List<SysPremiumDetails> detailsList = listMap.get(key);
 
-        Page<SysPremiumDetails> insOrdersPage = sysPremiumDetailsService.page(page, wrapper);
+            BigDecimal extractFee = detailsList.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
+            sysPremiumDetailsVo.setExtractFee(extractFee);
+            SysPremiumDetails sysPremiumDetails1 = detailsList.get(0);
+            String issuerId = sysPremiumDetails1.getIssuerId();
+            if (issuerId != null) {
+                SysUser sysUser1 = sysUserMapper.selectById(issuerId);
+                SysDept sysDept = sysDeptMapper.selectById(sysUser1.getDeptId());
+                SysAgencyLeader sysAgencyLeader = sysAgencyLeaderMapper.selectOne(new LambdaQueryWrapper<SysAgencyLeader>()
+                        .eq(SysAgencyLeader::getDelFlag, 1).eq(SysAgencyLeader::getDeptId, sysDept.getParentId()));
+                SysRelationPerson sysRelationPerson = sysRelationPersonMapper.selectOne(new LambdaQueryWrapper<SysRelationPerson>()
+                        .eq(SysRelationPerson::getAgencyLeaderId,sysAgencyLeader.getUserId())
+                        .eq(SysRelationPerson::getSource,0).eq(SysRelationPerson::getType,1));
 
+                SysPartner sysPartner = sysPartnerMapper.selectOne(new LambdaQueryWrapper<SysPartner>()
+                        .eq(SysPartner::getDelFlag, 1).eq(SysPartner::getUserId, sysRelationPerson.getSuggestId()));
+                sysPremiumDetailsVo.setProfferLevel(sysPartner.getType());
+                SysUser sysUser = sysUserMapper.selectById(sysPartner.getUserId());
+                sysPremiumDetailsVo.setProfferName(sysUser.getName());
+            }
+            sysPremiumDetailsVo.setSumpremium(sysPremiumDetails1.getSumpremium());
+            SysUser sysUser = sysUserMapper.selectById(sysPremiumDetails1.getIssuerId());
+            sysPremiumDetailsVo.setIssuerName(sysUser.getName());
+            sysPremiumDetailsVo.setIssuerId(sysPremiumDetails1.getIssuerId());
+            sysPremiumDetailsVo.setCreateTime(sysPremiumDetails1.getCreateTime());
+            sysPremiumDetailsVo.setLicenseno(sysPremiumDetails1.getLicenseno());
+            sysPremiumDetailsVo.setIndustrySector(sysPremiumDetails1.getIndustrySector());
+            sysPremiumDetailsVo.setStatus(sysPremiumDetails1.getStatus());
+
+            for (SysPremiumDetails premiumDetails : detailsList) {
+                SysPremiumInfoVo sysPremiumInfoVo = new SysPremiumInfoVo();
+                sysPremiumInfoVo.setSource(premiumDetails.getSource());
+                sysPremiumInfoVo.setSumpremium(premiumDetails.getSumpremium());
+                sysPremiumInfoVo.setProportional(premiumDetails.getProportional());
+                sysPremiumInfoVo.setExtractFee(premiumDetails.getExtractFee());
+                proportionList.add(sysPremiumInfoVo);
+            }
+            proportionList = proportionList.stream().sorted(Comparator.comparingInt(SysPremiumInfoVo::getSource)).collect(Collectors.toList());
+            sysPremiumDetailsVo.setProfferList(proportionList);
 
-        return new BasePageResult<>(commissionInfoDto.getPageNum(), page.getSize(), insOrdersPage.getTotal(), page.getPages(),
-                insOrdersPage.getRecords());
+            list.add(sysPremiumDetailsVo);
+        }
+
+        List<SysPremiumDetailsVo> collect = list.stream().limit(page.getSize()).collect(Collectors.toList());
+        long l = list.size() / page.getSize();
+        return new BasePageResult<>(commissionInfoDto.getPageNum(), page.getSize(), list.size(), l,
+                collect);
     }
 
     @Override
@@ -1318,30 +1475,33 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
     @Override
     public TeamUserInfosFreeVo getTeamUserInfo(TeamUserInfosDto teamUserInfosDto) {
         TeamUserInfosFreeVo teamUserInfosFreeVo = new TeamUserInfosFreeVo();
-
+        String loginId = BaseController.getUserId();
         List<TeamUserInfosVo> userInfosVoList = new ArrayList<>();
         List<String> userIds = teamUserInfosDto.getUserIds();
         if (CollectionUtil.isEmpty(userIds)) {
             return teamUserInfosFreeVo;
         }
-        //费用
-        List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
-                .in(SysPremiumDetails::getUserId, userIds)
-                .between(StringUtils.isNotEmpty(teamUserInfosDto.getBeginTime()) && StringUtils.isNotEmpty(teamUserInfosDto.getEndTime()),
-                        SysPremiumDetails::getCreateTime, teamUserInfosDto.getBeginTime(), teamUserInfosDto.getEndTime())
-                .eq(SysPremiumDetails::getStatus, 1)
-                .eq(teamUserInfosDto.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, teamUserInfosDto.getIndustrySector()));
-        BigDecimal sumPremium = sysPremiumDetails.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-        teamUserInfosFreeVo.setSumPremium(sumPremium);
-        List<SysUserAccountHistory> sysUserAccountHistories = sysUserAccountHistoryMapper.selectList(new LambdaQueryWrapper<SysUserAccountHistory>()
-                .in(SysUserAccountHistory::getUserId, userIds).eq(SysUserAccountHistory::getProperty, 3)
-                .eq(teamUserInfosDto.getIndustrySector() != null, SysUserAccountHistory::getBusinessSegmentsType, teamUserInfosDto.getIndustrySector()));
-        if (CollectionUtil.isNotEmpty(sysUserAccountHistories)) {
-            BigDecimal extractFee = sysUserAccountHistories.stream().map(SysUserAccountHistory::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
-            teamUserInfosFreeVo.setExtractFee(extractFee);
-        } else {
-            teamUserInfosFreeVo.setExtractFee(BigDecimal.ZERO);
+        BigDecimal sumPremium = BigDecimal.ZERO;
+        BigDecimal extractFee = 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(teamUserInfosDto.getBeginTime()) && StringUtils.isNotEmpty(teamUserInfosDto.getEndTime()),
+                            SysPremiumDetails::getCreateTime, teamUserInfosDto.getBeginTime(), teamUserInfosDto.getEndTime())
+                    .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());
+                BigDecimal reduce = sysPremiumDetails.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
+                extractFee = extractFee.add(reduce);
+            }
+
         }
+        teamUserInfosFreeVo.setSumPremium(sumPremium);
+        teamUserInfosFreeVo.setExtractFee(extractFee);
 
         List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
                 .ne(SysUser::getStatus, 0).in(SysUser::getId, teamUserInfosDto.getUserIds()));
@@ -1358,23 +1518,20 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
 
             //费用
             List<SysPremiumDetails> sysPremiumDetail = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
-                    .eq(SysPremiumDetails::getUserId, sysUser.getId())
+                    .eq(SysPremiumDetails::getIssuerId, sysUser.getId())
+                    .eq(SysPremiumDetails::getUserId, loginId)
                     .between(StringUtils.isNotEmpty(teamUserInfosDto.getBeginTime()) && StringUtils.isNotEmpty(teamUserInfosDto.getEndTime()),
                             SysPremiumDetails::getCreateTime, teamUserInfosDto.getBeginTime(), teamUserInfosDto.getEndTime())
                     .eq(SysPremiumDetails::getStatus, 1)
                     .eq(teamUserInfosDto.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, teamUserInfosDto.getIndustrySector()));
-            BigDecimal sumPremium1 = sysPremiumDetail.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-            teamUserInfosVo.setSumPremium(sumPremium1);
-            List<SysUserAccountHistory> sysUserAccountHistorie = sysUserAccountHistoryMapper.selectList(new LambdaQueryWrapper<SysUserAccountHistory>()
-                    .in(SysUserAccountHistory::getUserId, sysUser.getId()).eq(SysUserAccountHistory::getProperty, 3)
-                    .eq(teamUserInfosDto.getIndustrySector() != null, SysUserAccountHistory::getBusinessSegmentsType, teamUserInfosDto.getIndustrySector()));
-            if (CollectionUtil.isNotEmpty(sysUserAccountHistorie)) {
-                BigDecimal extractFee1 = sysUserAccountHistorie.stream().map(SysUserAccountHistory::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+            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 {
+            }else {
+                teamUserInfosVo.setSumPremium(BigDecimal.ZERO);
                 teamUserInfosVo.setExtractFee(BigDecimal.ZERO);
             }
-
             userInfosVoList.add(teamUserInfosVo);
         }
         teamUserInfosFreeVo.setTeamManNum(userIds.size());
@@ -1512,23 +1669,14 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         if (CollectionUtil.isEmpty(leaderIds)) {
             return partnerLeaderInfoVo;
         }
-        //费用
-        List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
-                .in(SysPremiumDetails::getUserId, leaderIds)
-                .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 sumPremium = sysPremiumDetails.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-        BigDecimal extractFee = sysPremiumDetails.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
-        partnerLeaderInfoVo.setSumPremium(sumPremium);
-        partnerLeaderInfoVo.setExtractFee(extractFee);
-
         List<SysAgencyLeader> leaderList = sysAgencyLeaderMapper.selectList(new LambdaQueryWrapper<SysAgencyLeader>()
                 .in(SysAgencyLeader::getUserId, leaderIds).eq(SysAgencyLeader::getDelFlag, 1));
-        List<String> userIds = new ArrayList<>();
 
+
+        List<String> userIdByLeader = getUserIdByLeader(leaderList);
         for (SysAgencyLeader sysAgencyLeader : leaderList) {
+            BigDecimal sumPremium1 = BigDecimal.ZERO;
+            BigDecimal extractFee1 = BigDecimal.ZERO;
             PartnerInfoVo partnerInfoVo = new PartnerInfoVo();
 
             String userId = sysAgencyLeader.getUserId();
@@ -1540,18 +1688,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
             partnerInfoVo.setDeptId(sysAgencyLeader.getDeptId());
             SysDept sysDept1 = sysDeptMapper.selectById(sysAgencyLeader.getDeptId());
             partnerInfoVo.setDeptName(sysDept1.getName());
-            //费用
-            List<SysPremiumDetails> sysPremiumDetail = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
-                    .eq(SysPremiumDetails::getUserId, userId)
-                    .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);
-
+            //团队总人数
             int deptManNum = 0;
             //获取机构下的团队
             List<SysDept> sysDeptList = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>()
@@ -1563,27 +1700,66 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
             List<String> collect = sysDeptList.stream().map(SysDept::getId).collect(Collectors.toList());
 
             partnerInfoVo.setDeptIds(collect);
-
             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));
                     deptManNum = deptManNum + sysUsers.size();
-                    if (sysUsers.size() > 0) {
-
-                        List<String> collect1 = sysUsers.stream().map(SysUser::getId).collect(Collectors.toList());
-                        userIds.addAll(collect1);
+                    if (CollectionUtil.isNotEmpty(sysUsers)) {
+                        for (SysUser user : sysUsers) {
+                            //费用
+                            List<SysPremiumDetails> sysPremiumDetail = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
+                                    .eq(SysPremiumDetails::getUserId, BaseController.getUserId())
+                                    .eq(SysPremiumDetails::getIssuerId, user.getId())
+                                    .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 (sysPremiumDetail.size() >0) {
+                                SysPremiumDetails sysPremiumDetails = sysPremiumDetail.get(0);
+                                sumPremium1= sumPremium1.add(sysPremiumDetails.getSumpremium());
+
+                                extractFee1 = extractFee1.add(sysPremiumDetail.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add));
+                            }
+                        }
                     }
-
                 }
             }
+            partnerInfoVo.setSumPremium(sumPremium1);
+            partnerInfoVo.setExtractFee(extractFee1);
             partnerInfoVo.setTeamManNum(deptManNum);
             partnerInfoVo.setLevel(partnerGradeInfo.getLevel());
 
             partnerInfoVoList.add(partnerInfoVo);
         }
+        //top总费用
+        BigDecimal sumPremium = BigDecimal.ZERO;
+        BigDecimal extractFee = BigDecimal.ZERO;
+        if (userIdByLeader.size()>0) {
+            for (String id : userIdByLeader) {
+                //总费用
+                List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
+                        .eq(SysPremiumDetails::getUserId, BaseController.getUserId())
+                        .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 (sysPremiumDetails.size() >0) {
+                    SysPremiumDetails sysPremiumDetails1 = sysPremiumDetails.get(0);
+                    sumPremium= sumPremium.add(sysPremiumDetails1.getSumpremium());
+
+                    extractFee = extractFee.add(sysPremiumDetails.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add));
+                }
+
+            }
+        }
+        partnerLeaderInfoVo.setSumPremium(sumPremium);
+        partnerLeaderInfoVo.setExtractFee(extractFee);
+
         int sum = partnerInfoVoList.stream().mapToInt(PartnerInfoVo::getTeamManNum).sum();
-        partnerLeaderInfoVo.setUserIds(userIds);
+        partnerLeaderInfoVo.setUserIds(userIdByLeader);
         partnerLeaderInfoVo.setTeamManNum(sum);
         partnerLeaderInfoVo.setPartnerInfoVoList(partnerInfoVoList);
 
@@ -1605,13 +1781,6 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         if (sysRelationPersonList.size() > 0) {
             List<String> collect = sysRelationPersonList.stream().map(SysRelationPerson::getSuggestId).collect(Collectors.toList());
 
-//            if (collect.size() > 4) {
-//                List<String> collect1 = collect.stream().limit(4).collect(Collectors.toList());
-//                ids.addAll(collect1);
-//            } else {
-//                ids.addAll(collect);
-//
-//            }
             if (collect.size()>0) {
                 ids.addAll(collect);
             }
@@ -1623,13 +1792,6 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         if (sysRelationList.size() > 0) {
 
             List<String> collect1 = sysRelationList.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
-//            if (collect1.size() > 4) {
-//                List<String> collect2 = collect1.stream().limit(4).collect(Collectors.toList());
-//                ids.addAll(collect2);
-//            } else {
-//                ids.addAll(collect1);
-//
-//            }
             if (collect1.size() >0) {
                 ids.addAll(collect1);
             }
@@ -1690,7 +1852,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                 //团队下的人数
                 List<SysUser> sysUserList = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
                         .likeRight(SysUser::getId, sysDept.getId())
-                        .in(SysUser::getStatus, Arrays.asList(1, 4, 5, 6, 7)));
+                        .ne(SysUser::getStatus, 0));
                 userList.addAll(sysUserList);
                 deptManSum = deptManSum + sysUserList.size();
             }
@@ -1830,6 +1992,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         List<SysRelationPerson> sysRelationPersonList = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
                 .eq(SysRelationPerson::getSuggestId, userId)
                 .eq(SysRelationPerson::getDelFlag, 1)
+                .eq(SysRelationPerson::getSource, 0)
                 .eq(SysRelationPerson::getType, 1));
         partnerCountVo.setWorkSum(sysRelationPersonList.size());
         if (CollectionUtil.isNotEmpty(sysRelationPersonList)) {
@@ -1902,6 +2065,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         List<SysRelationPerson> sysRelationPersonList = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
                 .eq(SysRelationPerson::getSuggestId, userId)
                 .eq(SysRelationPerson::getDelFlag, 1)
+                .eq(SysRelationPerson::getSource, 0)
                 .eq(SysRelationPerson::getType, 1));
         partnerCountVo.setWorkSum(sysRelationPersonList.size());
         if (CollectionUtil.isNotEmpty(sysRelationPersonList)) {
@@ -1925,7 +2089,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                         //团队下的人数
                         List<SysUser> sysUserList = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
                                 .likeRight(SysUser::getId, sysDept.getId())
-                                .in(SysUser::getStatus, Arrays.asList(1, 4, 5, 6, 7)));
+                                .ne(SysUser::getStatus, 0));
                         deptManSum = deptManSum + sysUserList.size();
                     }
                 }
@@ -2083,6 +2247,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
             List<SysRelationPerson> sysRelationPersonList = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
                     .eq(SysRelationPerson::getSuggestId, partner.getUserId())
                     .eq(SysRelationPerson::getDelFlag, 1)
+                    .eq(SysRelationPerson::getSource,0)
                     .eq(SysRelationPerson::getType, 0));
             levelPartnerVo.setDeptManNum(sysRelationPersonList.size());
             if (CollectionUtil.isNotEmpty(sysRelationPersonList)) {
@@ -2090,37 +2255,6 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                 levelPartnerVo.setPartnerIds(strings);
             }
 
-//            if (CollectionUtil.isNotEmpty(sysRelationPersonList)) {
-//                List<String> collects = sysRelationPersonList.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
-//                //查工作室下的团队
-//                List<SysAgencyLeader> leaderList = sysAgencyLeaderMapper.selectList(new LambdaQueryWrapper<SysAgencyLeader>()
-//                        .eq(SysAgencyLeader::getDelFlag, 1).in(SysAgencyLeader::getUserId, collects));
-//                int deptSum = 0;
-//                int deptManSum = 0;
-//                for (SysAgencyLeader sysAgencyLeader : leaderList) {
-//                    //根据机构id查下面团队
-//                    List<SysDept> sysDeptList = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>()
-//                            .likeRight(SysDept::getId, sysAgencyLeader.getDeptId())
-//                            .isNull(SysDept::getComlevel).eq(SysDept::getDelFlag, 0)
-//                            .eq(SysDept::getManagementSource, sysAgencyLeader.getSource()));
-//                    deptSum = deptSum + sysDeptList.size();
-//                    if (sysDeptList.size() > 0) {
-//                        for (SysDept sysDept : sysDeptList) {
-//                            //团队下的人数
-//                            List<SysUser> sysUserList = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
-//                                    .likeRight(SysUser::getId, sysDept.getId())
-//                                    .in(SysUser::getStatus, Arrays.asList(1, 4, 5, 6, 7)));
-//                            deptManSum = deptManSum + sysUserList.size();
-//                        }
-//                    }
-//                }
-//
-//                levelPartnerVo.setDeptManNum(deptManSum);
-//
-//            } else {
-//                levelPartnerVo.setDeptManNum(0);
-//            }
-
             partnerVoList.add(levelPartnerVo);
         }
 
@@ -2305,16 +2439,30 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
     }
 
     @Override
-    public PartnerInfoFreeVo getLevelPartnerInfo(List<String> partnerIds) {
-        PartnerInfoFreeVo partnerInfoFreeVo = new PartnerInfoFreeVo();
-        List<PartnerInfoVo> partnerInfoVoList = new ArrayList<>();
-
-
-
-
+    public List<LevelPartnerInfoVo> getLevelPartnerInfo(List<String> partnerIds) {
+        List<LevelPartnerInfoVo> partnerInfoVoList = new ArrayList<>();
+        if (CollectionUtil.isEmpty(partnerIds)) return partnerInfoVoList;
 
-
-        return partnerInfoFreeVo;
+        List<SysPartner> sysPartnerList = sysPartnerMapper.selectList(new LambdaQueryWrapper<SysPartner>()
+                .eq(SysPartner::getDelFlag,1).in(SysPartner::getUserId,partnerIds));
+        if (sysPartnerList.size() >0 ) {
+            for (SysPartner sysPartner : sysPartnerList) {
+                LevelPartnerInfoVo levelPartnerInfoVo = new LevelPartnerInfoVo();
+                levelPartnerInfoVo.setUserId(sysPartner.getUserId());
+                levelPartnerInfoVo.setLevel(sysPartner.getType());
+                List<SysRelationPerson> sysRelationPersonList = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
+                        .eq(SysRelationPerson::getSuggestId, sysPartner.getUserId())
+                        .eq(SysRelationPerson::getDelFlag, 1)
+                        .eq(SysRelationPerson::getSource, 0)
+                        .eq(SysRelationPerson::getType, 0));
+                levelPartnerInfoVo.setDeptManNum(sysRelationPersonList.size());
+                SysUser sysUser = sysUserMapper.selectById(sysPartner.getUserId());
+                if (sysUser == null) continue;
+                levelPartnerInfoVo.setUserName(sysUser.getName());
+                partnerInfoVoList.add(levelPartnerInfoVo);
+            }
+        }
+        return partnerInfoVoList;
     }
 
 

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

@@ -297,6 +297,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             UserWithdrawal withdrawal = new UserWithdrawal();
             withdrawal.setUserId(userId);
             withdrawal.setAmount(sysUserAccountVo.getAmount());
+            withdrawal.setBankNumber(sysUserAccountVo.getFromBankCardId());
             return ttqfService.userCashOut(withdrawal);
         }
         //add  by  hxl   2024-09-26 添加电销组员开关
@@ -416,8 +417,8 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
     }
 
     public boolean isManagement(String userId) {
-        SysUserBankCard bankCard = SpringUtil.getBean(SysUserBankCardMapper.class).selectByIdPay(userId);
-        if (ManagementSource.MS_02.getCode().equals(bankCard.getManagementSource())){
+        SysUser sysUser = SpringUtil.getBean(SysUserBankCardMapper.class).selectByIdPay(userId);
+        if (ManagementSource.MS_02.getCode().equals(sysUser.getManagementSource())){
             return true;
         }
         return false;

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

@@ -1533,11 +1533,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             treeShowLevel.setShowLevel("subordinate");
         }
         //获取领导字段不为空的人的ID
-        List<SysUser> users = lambdaQuery()
-                .isNotNull(SysUser::getLeaderId)
-                .ne(SysUser::getStatus, 0)
-                .list();
-        System.out.println(JSONObject.toJSONString(users));
+        List<SysUser> users = lambdaQuery().isNotNull(SysUser::getLeaderId).list();
 
         if (users == null || users.size() == 0) {
             return new ArrayList<>();
@@ -1870,61 +1866,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public List<SysUserBaseVO> getAllUsersByHospitality(SysUserVOExt sysUserVOExt) {
         if (StringUtils.isNotEmpty(sysUserVOExt.getUserId()) || StringUtils.isNotEmpty(sysUserVOExt.getIdentity()) ||
                 StringUtils.isNotEmpty(sysUserVOExt.getMobile()) || StringUtils.isNotEmpty(sysUserVOExt.getName())) {
-            List<SysUserBaseVO> allUsersByHospitality = super.baseMapper.getAllUsersByHospitality(sysUserVOExt);
-            //数据隔离操作
-            List<SysUserBaseVO> divideUserInfo = this.dataDivide(allUsersByHospitality);
-            return divideUserInfo;
+            return super.baseMapper.getAllUsersByHospitality(sysUserVOExt);
         }
         return new ArrayList<SysUserBaseVO>();
     }
 
-    private List<SysUserBaseVO> dataDivide(List<SysUserBaseVO> allUsersByHospitality) {
-        List<SysUserBaseVO> divideUserInfo = new ArrayList<>();
-        List<SysUser> userList = new ArrayList<>();
-        String userId = BaseController.getUserId();
-//        String userId = "99D1502";
-        if ("admin".equals(userId) || "99D1501".equals(userId)) {
-            return allUsersByHospitality;
-        }
-        SysUser sysUser = sysUserMapper.selectById(userId);
-        if ("99D1502".equals(userId)) {
-            List<SysUser> leaderUsers = sysUserMapper.selectByLeadId(userId);
-            List<String> leaderInfoList = leaderUsers.stream()
-                    .filter(userInfo -> !StringUtils.isNullOrEmpty(userInfo) && StringUtils.isNotEmpty(userInfo.getId())
-                            && !userInfo.getId().contains("M"))
-                    .map(userInfo -> userInfo.getId()).collect(Collectors.toList());
-            if (!StringUtils.isNullOrEmpty(leaderInfoList)) {
-                QueryWrapper<SysUser> leaderIds = new QueryWrapper<SysUser>().in("leader_id", leaderInfoList);
-                List<SysUser> sysUsers = sysUserMapper.selectList(leaderIds);
-                userList.addAll(sysUsers);
-            }
-            userList.addAll(leaderUsers);
-        } else if ("99D1502".equals(sysUser.getLeaderId())) {
-            userList.add(sysUser);
-            List<SysUser> leaderUsers = sysUserMapper.selectByLeadId(userId);
-            userList.addAll(leaderUsers);
-        } else {
-            List<SysUser> sysUsers = sysUserMapper.selectByLeadId(sysUser.getLeaderId());
-            SysUser loginUserLeader = sysUserMapper.selectById(sysUser.getLeaderId());
-            userList.add(loginUserLeader);
-            userList.addAll(sysUsers);
-        }
-
-        userList.stream()
-                .filter(user -> !StringUtils.isNullOrEmpty(user) && StringUtils.isNotEmpty(user.getIdentity()))
-                .forEach(user -> {
-                    allUsersByHospitality.stream()
-                            .filter(selectUser -> !StringUtils.isNullOrEmpty(selectUser) && StringUtils.isNotEmpty(selectUser.getIdentity())
-                                    && user.getIdentity().equals(selectUser.getIdentity()))
-                            .forEach(selectUser -> {
-                                selectUser.setLeaderId(user.getLeaderId());
-                                selectUser.setLeaderName(user.getLeaderName());
-                                divideUserInfo.add(selectUser);
-                            });
-                });
-        return divideUserInfo;
-    }
-
     /**
      * @version
      * @author: hxl

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

@@ -18,7 +18,6 @@ import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.dto.*;
 import com.ydtech.modules.admin.model.vo.BusinessAgentData;
-import com.ydtech.modules.admin.model.vo.BusinessOrderData;
 import com.ydtech.modules.admin.model.vo.TaskStatisticsVo;
 import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.admin.service.TaskStatisticsService;
@@ -41,7 +40,6 @@ import java.math.RoundingMode;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -693,17 +691,11 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
         HashMap<String, String> dateMapByType = getDateMapByTypeNew(taskStatisticsVo.getDateType(), taskStatisticsVo.getCreatetimeStart(), taskStatisticsVo.getCreatetimeEnd());
         taskStatisticsVo.setCreatetimeStart(dateMapByType.get("startDate"));
         taskStatisticsVo.setCreatetimeEnd(dateMapByType.get("endDate"));
-        getDateByType(taskStatisticsVo.getDateType(), taskStatisticsVo);
 
         IPage<BusinessAgentData> list = this.taskStatisticsMapper.getBusinessAgentData(page,taskStatisticsVo);
         List<BusinessAgentData> records = list.getRecords();
         for (BusinessAgentData record : records) {
             this.appendName(record);
-            //新增毛利润率   毛利润/成本(出口费用)
-            BigDecimal grossMarginBD = record.getDistributionAmount().divide(record.getExportAllFee(), 4, RoundingMode.HALF_UP); //毛利润率
-            DecimalFormat decimalFormat = new DecimalFormat("0.00%");
-            String grossMargin = decimalFormat.format(grossMarginBD);
-            record.setGrossMargin(grossMargin);
         }
         Long  total = this.taskStatisticsMapper.getBusinessAgentDataTotal(taskStatisticsVo);
         list.setTotal(total);
@@ -846,7 +838,6 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
         HashMap<String, String> dateMapByType = getDateMapByTypeNew(taskStatisticsVo.getDateType(), taskStatisticsVo.getCreatetimeStart(), taskStatisticsVo.getCreatetimeEnd());
         taskStatisticsVo.setCreatetimeStart(dateMapByType.get("startDate"));
         taskStatisticsVo.setCreatetimeEnd(dateMapByType.get("endDate"));
-        getDateByType(taskStatisticsVo.getDateType(), taskStatisticsVo);
 
 
         if(StringUtils.isNotEmpty(taskStatisticsVo.getTreeType()) || "3".equals(taskStatisticsVo.getManagementSource())){
@@ -967,7 +958,6 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
         HashMap<String, String> dateMapByType = getDateMapByType(taskStatisticsVo.getDateType(), taskStatisticsVo.getCreatetimeStart(), taskStatisticsVo.getCreatetimeEnd());
         taskStatisticsVo.setCreatetimeStart(dateMapByType.get("startDate"));
         taskStatisticsVo.setCreatetimeEnd(dateMapByType.get("endDate"));
-        getDateByType(taskStatisticsVo.getDateType(), taskStatisticsVo);
         PageVo<TaskStatisticsVo> pageVo = new PageVo<>();
         Page page = new Page(taskStatisticsVo.getPageNum(), taskStatisticsVo.getPageSize());
         page.setSearchCount(false).setOptimizeCountSql(false);//关闭count查询
@@ -1059,101 +1049,4 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
             }
         }
     }
-
-    /**
-     * @description:   任控制台-业务数据-渠道-详情
-     * @author: hh
-     * @date: 2024/11/19
-     **/
-    @Override
-    public PageInfo<BusinessOrderData> getBusinessOrderDataDetails(TaskStatisticsVo taskStatisticsVo) {
-        getDateByType(taskStatisticsVo.getDateType(), taskStatisticsVo);
-
-        PageHelper.startPage(taskStatisticsVo.getPageNum(), taskStatisticsVo.getPageSize());
-        List<BusinessOrderData> businessOrderList = this.taskStatisticsMapper.getBusinessOrderDataDetails(taskStatisticsVo);
-        for (BusinessOrderData businessOrderData : businessOrderList) {
-            BigDecimal entranceAllFee = businessOrderData.getEntranceAllFee() != null ? businessOrderData.getEntranceAllFee() : BigDecimal.ZERO;
-            BigDecimal exportAllFee = businessOrderData.getExportAllFee() != null ? businessOrderData.getExportAllFee() : BigDecimal.ZERO;
-            BigDecimal distributionAmount = entranceAllFee.subtract(exportAllFee);
-            businessOrderData.setDistributionAmount(distributionAmount); //毛利润
-            if (distributionAmount.compareTo(BigDecimal.ZERO) > 0) {
-                //新增毛利润率   毛利润/成本(出口费用)
-                BigDecimal grossMarginBD = distributionAmount.divide(exportAllFee, 4, RoundingMode.HALF_UP); //毛利润率
-                DecimalFormat decimalFormat = new DecimalFormat("0.00%");
-                String grossMargin = decimalFormat.format(grossMarginBD);
-                businessOrderData.setGrossMargin(grossMargin);
-            } else {
-                businessOrderData.setGrossMargin("0.00%");
-            }
-        }
-        return new PageInfo<>(businessOrderList);
-    }
-
-
-    /**
-     * @description:   任控制台-业务数据-渠道-合计
-     * @author: hh
-     * @date: 2024/11/19
-     **/
-    @Override
-    public BusinessOrderData getBusinessOrderDataTotal(TaskStatisticsVo taskStatisticsVo) {
-        getDateByType(taskStatisticsVo.getDateType(), taskStatisticsVo);
-
-        BusinessOrderData result = this.taskStatisticsMapper.getBusinessOrderDataTotal(taskStatisticsVo);
-
-        BigDecimal sumPremium = result.getSumPremium();
-        BusinessAgentData allsumPremium = this.taskStatisticsMapper.getAllsumPremium(taskStatisticsVo);
-        if (ObjectUtils.isNotEmpty(sumPremium)) {
-            BigDecimal allSumPremium = allsumPremium.getSumPremium();
-            if (sumPremium.compareTo(BigDecimal.ZERO) == 1) {
-                BigDecimal multiply = sumPremium.divide(allSumPremium, 4, BigDecimal.ROUND_DOWN);
-                result.setSumPremiumProportion(multiply);
-            }
-        } else {
-            result.setSumPremiumProportion(BigDecimal.ZERO);
-        }
-
-        BigDecimal entranceAllFee = result.getEntranceAllFee() != null ? result.getEntranceAllFee() : BigDecimal.ZERO;
-        BigDecimal exportAllFee = result.getExportAllFee() != null ? result.getExportAllFee() : BigDecimal.ZERO;
-        BigDecimal subtract = entranceAllFee.subtract(exportAllFee);
-        result.setDistributionAmount(subtract); //毛利润
-        if (subtract.compareTo(BigDecimal.ZERO) > 0) {
-            //新增毛利润率   毛利润/成本(出口费用)
-            BigDecimal grossMarginBD = subtract.divide(exportAllFee, 4, RoundingMode.HALF_UP); //毛利润率
-            DecimalFormat decimalFormat = new DecimalFormat("0.00%");
-            String grossMargin = decimalFormat.format(grossMarginBD);
-            result.setGrossMargin(grossMargin);
-        } else {
-            result.setGrossMargin(BigDecimal.ZERO.toString());
-        }
-        return result;
-    }
-
-    /**
-     *  @version
-     *  @author: hh
-     *  @Date: 2024/11/19
-     *  @Description:  通过时间类型判断
-     */
-    private static void getDateByType(String type, TaskStatisticsVo taskStatisticsVo) {
-        String  startDateStr= new String();
-        String  endDateStr= new String();
-        if (StringUtils.isNotEmpty(type)) {
-            switch (type) {
-                case "1" : startDateStr= SliceUpDateUtil.getBeforeDay(new Date(),0)+" 00:00:00";
-                           endDateStr=SliceUpDateUtil.getBeforeDay(new Date(),0)+" 23:59:59";
-                           break;
-                case "2" : startDateStr= SliceUpDateUtil.getBeforeDay(new Date(),1)+" 00:00:00";
-                           endDateStr=SliceUpDateUtil.getBeforeDay(new Date(),0)+" 23:59:59";
-                           break;
-                case "3" : startDateStr= SliceUpDateUtil.getBeforeDay(new Date(),6)+" 00:00:00";
-                           endDateStr=SliceUpDateUtil.getBeforeDay(new Date(),0)+" 23:59:59";
-                           break;
-            }
-            taskStatisticsVo.setSigningTimeStart(startDateStr);
-            taskStatisticsVo.setSigningTimeEnd(endDateStr);
-            taskStatisticsVo.setEnterTimeStart(startDateStr);
-            taskStatisticsVo.setEnterTimeEnd(endDateStr);
-        }
-    }
 }

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

@@ -2012,12 +2012,15 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
                         item.setHandlingFeesStatus("2");
                         if (StringUtils.isNotEmpty(item.getTaskId())) {
                             return HttpResult.error("该单据已经开票 ");
-                        } else {
-                            item.setTaskId(importResult.getId());
-                            item.setSettlementTime(LocalDateTime.now());
-                            baseMapper.updateById(item);
                         }
+
+//                        else {
+//                            item.setTaskId(importResult.getId());
+//                            item.setSettlementTime(LocalDateTime.now());
+//                            baseMapper.updateById(item);
+//                        }
                     }
+                    this.saveOrUpdateBatch(insPlyIncomes);
                 }
             }
         }

src/main/java/com/ydtech/modules/lg/PushLgLogUtils.java

@@ -10,6 +10,7 @@ import com.ydtech.utils.StringUtils;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
 import java.util.HashMap;
 
 @Component
@@ -17,17 +18,22 @@ public class PushLgLogUtils {
 
     @Async
     public void pushLg(PushLgEntity lgEntity){
-        JSONObject jsonObject = JSONObject.parseObject(SendUtils.send(JSONObject.toJSONString(lgEntity)));
-        if (null != jsonObject){
-            lgEntity.setPushStatus(String.valueOf(jsonObject.getInteger("code")));
-            lgEntity.setMsg(jsonObject.getString("msg"));
-        }else {
-            lgEntity.setPushStatus("");
-            lgEntity.setMsg("推送失败");
-        }
-        SpringUtil.getBean(PushLgEntityMapper.class).insert(lgEntity);
-        if (!StringUtils.equals(lgEntity.getPushStatus(),"200")){
-            pushLgRetry(lgEntity);
+        int insert = SpringUtil.getBean(PushLgEntityMapper.class).insert(lgEntity);
+        if (insert > 0){
+            lgEntity.setZgUuid(lgEntity.getId());
+            lgEntity.setId(null);
+            JSONObject jsonObject = JSONObject.parseObject(SendUtils.send(JSONObject.toJSONString(lgEntity)));
+            if (null != jsonObject && String.valueOf(jsonObject.getInteger("code")).equals("200")){
+                lgEntity.setPushStatus(String.valueOf(jsonObject.getInteger("code")));
+                lgEntity.setMsg(jsonObject.getString("msg"));
+                lgEntity.setSuccessPushTime(new Date());
+            }else {
+                lgEntity.setPushStatus("");
+                lgEntity.setMsg("推送失败");
+            }
+            if (!StringUtils.equals(lgEntity.getPushStatus(),"200")){
+                pushLgRetry(lgEntity);
+            }
         }
     }
 
@@ -37,6 +43,7 @@ public class PushLgLogUtils {
             HashMap<String, Object> map = new HashMap<>();
             map.put("lgEntity", lgEntity);
             QuartzManager manager = QuartzManager.getInstance();
+            manager.getContext().put("executionFrequency",1);
             manager.addJob(String.valueOf(lgEntity.getId()),"jobGroup" + lgEntity.getId(), PushRetry.class,"*/5 * * * * ?",map);
             manager.start();
         }catch (Exception e){

src/main/java/com/ydtech/modules/lg/PushRetry.java

@@ -5,26 +5,45 @@ import com.alibaba.fastjson.JSONObject;
 import com.ydtech.modules.lg.dao.PushLgEntityMapper;
 import com.ydtech.modules.lg.model.PushLgEntity;
 import com.ydtech.modules.ttqf.QuartzManager;
+import lombok.extern.slf4j.Slf4j;
 import org.quartz.*;
 
+import java.util.Date;
+
+@Slf4j
 public class PushRetry implements Job {
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        JobDataMap mergedJobDataMap = jobExecutionContext.getMergedJobDataMap();
-        Object object = mergedJobDataMap.get("lgEntity");
-        PushLgEntity lgEntity = JSONObject.parseObject((JSONObject.toJSONString(object)) , PushLgEntity.class);
-        JSONObject jsonObject = JSONObject.parseObject(SendUtils.send(JSONObject.toJSONString(lgEntity)));
-        if (null != jsonObject){
-            if (String.valueOf(jsonObject.getInteger("code")).equals("200")){
-                lgEntity.setPushStatus(String.valueOf(jsonObject.getInteger("code")));
-                lgEntity.setMsg(jsonObject.getString("msg"));
-                SpringUtil.getBean(PushLgEntityMapper.class).updateById(lgEntity);
-                try {
-                    QuartzManager.getInstance().removeJob(jobExecutionContext);
-                }catch (Exception e){
-                    e.printStackTrace();
+        try {
+            Integer executionFrequency = (Integer)QuartzManager.getInstance().getContext().get("executionFrequency");
+            JobDataMap mergedJobDataMap = jobExecutionContext.getMergedJobDataMap();
+            Object object = mergedJobDataMap.get("lgEntity");
+            PushLgEntity lgEntity = JSONObject.parseObject((JSONObject.toJSONString(object)) , PushLgEntity.class);
+            JSONObject jsonObject = JSONObject.parseObject(SendUtils.send(JSONObject.toJSONString(lgEntity)));
+            if (null != jsonObject){
+                if (String.valueOf(jsonObject.getInteger("code")).equals("200")){
+                    lgEntity.setPushStatus(String.valueOf(jsonObject.getInteger("code")));
+                    lgEntity.setMsg(jsonObject.getString("msg"));
+                    lgEntity.setSendNumber(executionFrequency);
+                    lgEntity.setSuccessPushTime(new Date());
+                    SpringUtil.getBean(PushLgEntityMapper.class).updateById(lgEntity);
+                    try {
+                        QuartzManager.getInstance().removeJob(jobExecutionContext);
+                    }catch (Exception e){
+                        e.printStackTrace();
+                    }
                 }
             }
+            if (executionFrequency > 10){
+                lgEntity.setSendNumber(executionFrequency);
+                SpringUtil.getBean(PushLgEntityMapper.class).updateById(lgEntity);
+                QuartzManager.getInstance().removeJob(jobExecutionContext);
+            }
+            executionFrequency ++;
+            log.info("lg推送重试任务执行{}",executionFrequency);
+            QuartzManager.getInstance().getContext().put("executionFrequency",executionFrequency);
+        }catch (Exception e){
+            e.printStackTrace();
         }
     }
 }

src/main/java/com/ydtech/modules/lg/SendUtils.java

@@ -29,7 +29,7 @@ public class SendUtils {
         // 获得Http客户端(可以理解为:你得先有一个浏览器;注意:实际上HttpClient与浏览器是不一样的)
         CloseableHttpClient httpClient = HttpClientBuilder.create().build();
         // 创建Post请求
-        HttpPost httpPost = new HttpPost(sendMessageIP + "withdrawal/record/acceptPushWithdrawalData");
+        HttpPost httpPost = new HttpPost(sendMessageIP + "/withdrawal/record/acceptPushWithdrawalData");
         StringEntity entity = new StringEntity(data, "UTF-8");
         // post请求是将参数放在请求体里面传过去的;这里将entity放入post请求体中
         httpPost.setEntity(entity);

src/main/java/com/ydtech/modules/lg/model/PushLgEntity.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.lg.model;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -52,5 +53,9 @@ public class PushLgEntity {
 
     private int sendNumber;
 
+    private Date successPushTime;
+
+    @TableField(exist = false)
+    private Long zgUuid;
 
 }

src/main/java/com/ydtech/modules/order/service/impl/InsCrawlerOrderServiceImpl.java

@@ -457,6 +457,7 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
             quoteRespVo.setWarnMessageList(response.getOther().getErrorCodeMap());
         }
         // 验车支付链接
+        insAreaCompany.setVehicleInspectionUrl(response.getOther().getUpimageUrl());
         quoteRespVo.setVehicleInspectionUrl(response.getOther().getUpimageUrl());
         
         if(response.getOther().getCiMessage() != null && !response.getOther().getCiMessage().equals("")){

src/main/java/com/ydtech/modules/order/service/impl/YongchengOrderApiServiceImpl.java

@@ -871,6 +871,7 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
     public HttpResult callbackAnOrder(String quoteOrderNo) {
 
         InsAreaCompany iac = insAreaCompanyService.getById(quoteOrderNo);
+
         InsOrders order = insOrdersService.getById(iac.getOrderno());
         AssertionUtils.isEmpty(iac, "报价订单不存在");
 

src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementUndwrtRulesNewServiceImpl.java

@@ -107,9 +107,13 @@ public class PtlAgreementUndwrtRulesNewServiceImpl extends ServiceImpl<PtlAgreem
 
     @Override
     public List<PtlAgreementUndwrtRulesNew> rulesList(String agreementId) {
+        LocalDateTime now = LocalDateTime.now();
         List<PtlAgreementUndwrtRulesNew> rulesList = baseMapper.selectList(new LambdaQueryWrapper<PtlAgreementUndwrtRulesNew>()
                 .eq(PtlAgreementUndwrtRulesNew::getAgreementId, agreementId)
-                .eq(PtlAgreementUndwrtRulesNew::getValidInd, "1"));
+                .eq(PtlAgreementUndwrtRulesNew::getValidInd, "1")
+                .le(PtlAgreementUndwrtRulesNew::getRulesStartDate, now)
+                .ge(PtlAgreementUndwrtRulesNew::getRulesEndDate, now));
+
         List<PtlAgreementUndwrtRulesAttrLink> ptlAgreementUndwrtRulesAttrLinkList = ptlAgreementUndwrtRulesAttrLinkService.list();
         rulesList.forEach(item -> {
             List<PtlAgreementUndwrtRulesAttrLink> collect = ptlAgreementUndwrtRulesAttrLinkList.stream().filter(x -> Objects.equals(x.getRulesId(), item.getId())).collect(Collectors.toList());

src/main/java/com/ydtech/modules/ttqf/QuartzUserSign.java

@@ -1,32 +0,0 @@
-package com.ydtech.modules.ttqf;
-
-import cn.hutool.extra.spring.SpringUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.quartz.*;
-
-
-@Slf4j
-public class QuartzUserSign implements Job {
-    @Override
-    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        try {
-            if ((boolean) QuartzManager.getInstance().getContext().get("flag")){
-                JobDataMap mergedJobDataMap = jobExecutionContext.getMergedJobDataMap();
-                String idCardNo = String.valueOf(mergedJobDataMap.get("idCardNo"));
-                log.info("用户签约状态查询入参:{}",idCardNo);
-                if (SpringUtil.getBean(RetrieveTTQFApi.class).queryPressing(idCardNo)){
-                    log.info("用户签约状态查询成功");
-                    QuartzManager.getInstance().removeJob(jobExecutionContext);
-                }
-                log.info("当前线程+++++++++++++{}",Thread.currentThread().getId());
-            }else {
-                log.info("获取天天企赋状态退出",jobExecutionContext.getJobDetail().getKey().getName());
-                QuartzManager.getInstance().removeJob(jobExecutionContext);
-            }
-        } catch (SchedulerException e) {
-            throw new RuntimeException(e);
-        }
-
-    }
-
-}

src/main/java/com/ydtech/modules/ttqf/RegularlyPaymentStatus.java

@@ -1,77 +0,0 @@
-package com.ydtech.modules.ttqf;
-
-
-import cn.hutool.extra.spring.SpringUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ipaynow.jiaxin.domain.OrderQueryResultModel;
-import com.ipaynow.jiaxin.response.OrderQueryResponse;
-import com.ydtech.modules.ttqf.dao.PaymentNoticeMapper;
-import com.ydtech.modules.ttqf.entity.PaymentNoticeEntity;
-import com.ydtech.utils.StringUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Component;
-
-import java.util.*;
-
-@Component
-@Slf4j
-public class RegularlyPaymentStatus {
-
-
-    @Async
-    public void  updatePaymentStatus(String orderNo){
-        Timer timer = new Timer();
-        final int[] executionCount = {1};
-        TimerTask task = new TimerTask() {
-            @Override
-            public void run() {
-                try {
-                    log.info("打款状态定时任务入参:{}",orderNo);
-                    OrderQueryResponse response = SpringUtil.getBean(RetrieveTTQFApi.class).orderQuery(orderNo);
-                    log.info("打款状态定时返回执行数据:{}", JSONObject.toJSONString(response.getResultModel()));
-                    if (response == null || !StringUtils.equals(response.getBizCode(),"0000")) {
-                        log.info("获取打款状态任务退出{}");
-                        timer.cancel();
-                    }
-                    if (response.isSuccess()) {
-                        if (Arrays.stream(PayConstantStatus.ORDER_ARRAY).anyMatch(i -> Objects.equals(i,response.getResultModel().getStatus()))){
-                            updatePayLog(orderNo,response.getResultModel());
-                            log.info("获取打款状态任务退出");
-                            timer.cancel();
-                        }
-                    }
-                    log.info("当前线程+++++++++++++{}",Thread.currentThread().getId());
-//                    if (executionCount[0] == 20){
-//                        log.info("获取打款状态任务退出{}");
-//                        timer.cancel();
-//                    }
-                }catch (Exception e){
-                    log.error("定时获取打款状态任务异常:{}",e.getMessage());
-                    timer.cancel();
-                }
-                executionCount[0]++;
-            }
-        };
-        timer.schedule(task, 2000, 5000);
-    }
-
-
-    public void updatePayLog(String orderNo, OrderQueryResultModel resultModel){
-        QueryWrapper<PaymentNoticeEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq("order_no",orderNo);
-        PaymentNoticeEntity notice = SpringUtil.getBean(PaymentNoticeMapper.class).selectOne(wrapper);
-        if (null == notice){
-            PaymentNoticeEntity noticeEntity = JSONObject.parseObject(JSONObject.toJSONString(resultModel), PaymentNoticeEntity.class);
-            if (null == noticeEntity.getPayTime()){
-                noticeEntity.setPayTime(new Date());
-            }
-            noticeEntity.setCreateTime(new Date());
-            int update = SpringUtil.getBean(PaymentNoticeMapper.class).insert(noticeEntity);
-            log.info("获取打款状态成功正在保存===========：{}",orderNo ,"+++++", update > 0 ? "保存成功" : "保存失败");
-        }
-    }
-
-
-}

src/main/java/com/ydtech/modules/ttqf/RegularlyUpdateStatus.java

@@ -1,71 +0,0 @@
-package com.ydtech.modules.ttqf;
-
-import cn.hutool.extra.spring.SpringUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ipaynow.jiaxin.domain.OrderQueryResultModel;
-import com.ipaynow.jiaxin.response.OrderQueryResponse;
-import com.ydtech.modules.ttqf.dao.PaymentNoticeMapper;
-import com.ydtech.modules.ttqf.entity.PaymentNoticeEntity;
-import com.ydtech.utils.StringUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.quartz.*;
-
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Objects;
-
-
-@Slf4j
-public class RegularlyUpdateStatus implements Job {
-    @Override
-    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        try {
-            if ((boolean) QuartzManager.getInstance().getContext().get("flag")){
-                JobDataMap mergedJobDataMap = jobExecutionContext.getMergedJobDataMap();
-                String orderNo = String.valueOf(mergedJobDataMap.get("orderNo"));
-                log.info("打款状态定时任务入参:{}",orderNo);
-                OrderQueryResponse response = SpringUtil.getBean(RetrieveTTQFApi.class).orderQuery(orderNo);
-                log.info("打款状态定时返回执行数据:{}", JSONObject.toJSONString(response.getResultModel()));
-                if (response == null || !StringUtils.equals(response.getBizCode(),"0000")) {
-                    log.info("获取打款状态任务退出{}");
-                    QuartzManager.getInstance().removeJob(jobExecutionContext);
-                }
-                if (response.isSuccess()) {
-                    if (Arrays.stream(PayConstantStatus.ORDER_ARRAY).anyMatch(i -> Objects.equals(i,response.getResultModel().getStatus()))){
-                        updatePayLog(orderNo,response.getResultModel());
-                        log.info("获取打款状态任务退出");
-                    }
-                    QuartzManager.getInstance().removeJob(jobExecutionContext);
-                }
-                log.info("当前线程+++++++++++++{}",Thread.currentThread().getId());
-            }else {
-                log.info("获取天天企赋状态退出",jobExecutionContext.getJobDetail().getKey().getName());
-                QuartzManager.getInstance().removeJob(jobExecutionContext);
-            }
-
-        } catch (SchedulerException e) {
-            throw new RuntimeException(e);
-        }
-
-    }
-
-
-
-    public void updatePayLog(String orderNo, OrderQueryResultModel resultModel){
-        QueryWrapper<PaymentNoticeEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq("order_no",orderNo);
-        PaymentNoticeEntity notice = SpringUtil.getBean(PaymentNoticeMapper.class).selectOne(wrapper);
-        if (null == notice){
-            PaymentNoticeEntity noticeEntity = JSONObject.parseObject(JSONObject.toJSONString(resultModel), PaymentNoticeEntity.class);
-            if (null == noticeEntity.getPayTime()){
-                noticeEntity.setPayTime(new Date());
-            }
-            noticeEntity.setCreateTime(new Date());
-            int update = SpringUtil.getBean(PaymentNoticeMapper.class).insert(noticeEntity);
-            log.info("获取打款状态成功正在保存===========：{}",orderNo ,"+++++", update > 0 ? "保存成功" : "保存失败");
-        }
-    }
-
-
-}

src/main/java/com/ydtech/modules/ttqf/RetrieveTTQFApi.java

@@ -10,7 +10,7 @@ import com.ipaynow.jiaxin.domain.*;
 import com.ipaynow.jiaxin.request.*;
 import com.ipaynow.jiaxin.response.*;
 import com.ydtech.exception.SystemException;
-import com.ydtech.modules.admin.model.po.SysUserBankCard;
+import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.esm.model.vo.EsmUserImageQueryVo;
 import com.ydtech.modules.esm.service.EsmUserImageService;
 import com.ydtech.modules.order.entity.api.bohai.constants.DocumentClass;
@@ -41,7 +41,6 @@ public class RetrieveTTQFApi {
 
     private static PayUserSignService signService;
 
-    private static RegularlyPaymentStatus paymentStatus;
 
     @Resource
     private void setSignService(PayUserSignService userSignService){
@@ -49,12 +48,6 @@ public class RetrieveTTQFApi {
     }
 
 
-    @Resource
-    private void setPaymentStatus(RegularlyPaymentStatus status){
-        paymentStatus = status;
-    }
-
-
     @Resource
     private void setSavePayOrder(SavePayOrder order){
         savePayOrder = order;
@@ -64,32 +57,44 @@ public class RetrieveTTQFApi {
     private void setConfig(TangClient client){
         tangClient = client;
     }
-    public  static boolean extractBalance(SysUserBankCard bankCard,UserWithdrawal withdrawal){
-        if (queryPressing(bankCard.getIdentity())){
+
+
+
+    public  static boolean extractBalance(SysUser sysUser,UserWithdrawal withdrawal){
+        QueryPresignResultModel resultModel = queryPressing(sysUser.getIdentity());
+        //这俩验证银行卡是否处于绑定状态
+        List<QueryPresignResultModel.BankCard> cards = resultModel.getCards();
+        //
+        QueryPresignResultModel.BankCard bankCard = cards.stream().filter(v -> v.getBankCardNo().equals(withdrawal.getBankNumber())).findAny().orElse(null);
+        if (bankCard == null){
+            throw new SystemException("银行卡未绑定");
+        }
+        if (Objects.equals(PayConstantStatus.SIGN_STATUS,resultModel.getSignStatus()) &&
+                Objects.equals(PayConstantStatus.AUTH_STATUS,resultModel.getAuthStatus())){
             BigDecimal accountBalance = balance();
             if (BigDecimal.ZERO.compareTo(accountBalance) == 0 || (accountBalance.compareTo(withdrawal.getAmount()) == -1)){
                 throw new SystemException("商户余额不足，请联系管理员");
             }
             //用户已经签约  进行打款操作
-            return orderAdd(bankCard, withdrawal.getAmount(), withdrawal.getRemarks());
+            return orderAdd(sysUser, withdrawal);
         } else {
             return false;
         }
     }
 
     
-    public  static boolean orderAdd(SysUserBankCard bankCard,BigDecimal amount,String remark){
+    public  static boolean orderAdd(SysUser sysUser,UserWithdrawal withdrawal){
         OrderAddModel addModel = OrderAddModel.builder()
                 .mchBatchNo(System.currentTimeMillis() + "")
                 .mchOrderNo(GenerateOrderNumberUtils.nextNumber() + "")
                 //收款人姓名
-                .userName(bankCard.getUserName())
+                .userName(sysUser.getName())
                 //收款人手机号
-                .userMobile(bankCard.getMobile())
+                .userMobile(sysUser.getMobile())
                 //收款账号
-                .userBankCardNo(bankCard.getBankNumber())
+                .userBankCardNo(withdrawal.getBankNumber())
                 //收款人身份证号
-                .userIdCardNo(bankCard.getIdentity())
+                .userIdCardNo(sysUser.getIdentity())
                 //工作量衡量标准模板
                 .userWorkload("1849326302238785538")
                 //工作量衡量标准
@@ -98,15 +103,15 @@ public class RetrieveTTQFApi {
                 )
                 //打款金额 Number(15,2)
                 // M 单位为元，风控可调额
-                .amount(amount)
-                .remark(remark)
+                .amount(withdrawal.getAmount())
+                .remark(withdrawal.getRemarks())
                 //收款方式非必填：默认0-银行卡枚举：0-银行卡、1-支付宝、2-微信
                 .paymentType(0)
                 //选填项：微信APPID，若填写，以填写项稳准，否则应用预留配置的微信appid；该字段适用于同主体下含有多个公众号或小程序的场景
                 .wechatAppId("")
                 .notifyUrl(PayConstantStatus.getPaymentNoticeUrl())
                 .build();
-        OrderAddResponse response = testOrderAdd(addModel, bankCard.getUserId());
+        OrderAddResponse response = testOrderAdd(addModel, sysUser.getId());
         if(response.isSuccess()) {
             log.info("成功 ====>orderAdd {}", response.getResultModel());
         } else {
@@ -187,20 +192,20 @@ public class RetrieveTTQFApi {
     /**
      * 用户预签约接口
      */
-    public static String pres(SysUserBankCard bankCard){
+    public static String pres(SysUser sysUser,UserWithdrawal withdrawal){
         PresignRequest request = new PresignRequest();
-        List<EsmUserImageQueryVo> esmUserImageQueryVo = SpringUtil.getBean(EsmUserImageService.class).getEsmUserImageQueryVo(bankCard.getUserId());
+        List<EsmUserImageQueryVo> esmUserImageQueryVo = SpringUtil.getBean(EsmUserImageService.class).getEsmUserImageQueryVo(sysUser.getId());
         if (CollectionUtils.isEmpty(esmUserImageQueryVo)){
             throw new SystemException("用户影像资料不存在，请补全后在申请提现");
         }
         PresignModel presignModel = new PresignModel();
-        presignModel.setName(bankCard.getUserName());
-        presignModel.setMobile(bankCard.getMobile());
-        presignModel.setIdCardNo(bankCard.getIdentity());
-        presignModel.setBankCardNo(bankCard.getBankNumber());
-        if (bankCard.getIdentityTime().contains(",")){
-            presignModel.setExpiryStart(bankCard.getIdentityTime().split(",")[0]);
-            presignModel.setExpiryEnd(bankCard.getIdentityTime().split(",")[1]);
+        presignModel.setName(sysUser.getName());
+        presignModel.setMobile(sysUser.getMobile());
+        presignModel.setIdCardNo(sysUser.getIdentity());
+        presignModel.setBankCardNo(withdrawal.getBankNumber());
+        if (sysUser.getIdentityTime().contains(",")){
+            presignModel.setExpiryStart(sysUser.getIdentityTime().split(",")[0]);
+            presignModel.setExpiryEnd(sysUser.getIdentityTime().split(",")[1]);
         }else {
             throw new SystemException("用户身份证有效日期不全，请检查");
         }
@@ -231,7 +236,7 @@ public class RetrieveTTQFApi {
         PresignResponse response = tangClient.execute(request);
         if(response.isSuccess()) {
             log.info("成功 ====>Pressing {}", response.getResultModel());
-            return contractH5(bankCard.getIdentity());
+            return contractH5(sysUser.getIdentity());
         } else {
             log.error("失败{}", response);
             return response.getBizMsg();
@@ -241,20 +246,16 @@ public class RetrieveTTQFApi {
     /**
      * 用户预签约结果查询接口
      */
-    public static boolean queryPressing(String idCardNo) {
+    public static QueryPresignResultModel queryPressing(String idCardNo) {
         QueryPresignResponse response = tangClient.execute(QueryPresignRequest.builder().requestId(System.currentTimeMillis() + "")
                 .bizModel(new QueryPresignModel(idCardNo)).build());
         if(response.isSuccess()) {
-            QueryPresignResultModel resultModel = response.getResultModel();
-            if (Objects.equals(PayConstantStatus.SIGN_STATUS,resultModel.getSignStatus()) &&
-                    Objects.equals(PayConstantStatus.AUTH_STATUS,resultModel.getAuthStatus())){
-                return true;
-            }
-            log.info("成功 ====>QueryPressing {}", resultModel);
+            log.info("成功 ====>QueryPressing {}", response.getResultModel());
+            return response.getResultModel();
         } else {
             log.error("失败{}", response);
         }
-        return false;
+        return null;
     }
 
     /**
@@ -285,8 +286,13 @@ public class RetrieveTTQFApi {
                 .bizModel(addModel)
                 .build();
         OrderAddResponse response = tangClient.execute(addRequest);
-        boolean confirm = confirm(response.getResultModel().getOrderNo(),response.getResultModel().getBatchNo());
-        savePayOrder.savePayOrder(addRequest.getApiUrl(),response, JSONObject.toJSONString(addModel),JSONObject.toJSONString(response),userId, confirm,addModel.getUserBankCardNo());
+        boolean confirm = false;
+        String sysAmountAuditingId = "";
+        if (response.isSuccess()){
+            confirm = confirm(response.getResultModel().getOrderNo(),response.getResultModel().getBatchNo());
+            sysAmountAuditingId = SpringUtil.getBean(AmountAuditingService.class).sendMessage(response.getResultModel().getAmount(), userId, addModel.getUserBankCardNo());
+        }
+        savePayOrder.savePayOrder(addRequest.getApiUrl(),response, JSONObject.toJSONString(addModel),JSONObject.toJSONString(response),userId, confirm,sysAmountAuditingId);
         return response;
     }
 
@@ -350,7 +356,7 @@ public class RetrieveTTQFApi {
             hashMap.put("orderNo",orderNo);
             QuartzManager manager = QuartzManager.getInstance();
             manager.getContext().put("flag",true);
-            manager.addJob(orderNo,"jobGroup" + orderNo, RegularlyUpdateStatus.class,"*/5 * * * * ?",hashMap);
+            //manager.addJob(orderNo,"jobGroup" + orderNo, RegularlyUpdateStatus.class,"*/5 * * * * ?",hashMap);
             manager.start();
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/ydtech/modules/ttqf/SavePayOrder.java

@@ -16,7 +16,7 @@ import java.util.Date;
 public class SavePayOrder {
 
     @Async
-    public  void savePayOrder(String url, OrderAddResponse response, String requestData, String responseData, String userId,boolean confirm,String userBankCardNo){
+    public  void savePayOrder(String url, OrderAddResponse response, String requestData, String responseData, String userId,boolean confirm,String sysAmountAuditingId){
         PayTtqfLog ttqfLog = new PayTtqfLog();
         ttqfLog.setSedStatus(response.isSuccess());
         ttqfLog.setApiUrl(url);
@@ -35,7 +35,6 @@ public class SavePayOrder {
         ttqfLog.setAmount(response.getResultModel().getAmount());
         ttqfLog.setFeeAmount(response.getResultModel().getFeeAmount());
         ttqfLog.setPaymentType(response.getResultModel().getPaymentType());
-        String sysAmountAuditingId = SpringUtil.getBean(AmountAuditingService.class).sendMessage(response.getResultModel().getAmount(), userId, userBankCardNo);
         ttqfLog.setSysAmountAuditingId(sysAmountAuditingId);
         SpringUtil.getBean(PayTtqfLogMapper.class).insert(ttqfLog);
     }

src/main/java/com/ydtech/modules/ttqf/controller/TtqfController.java

@@ -2,7 +2,6 @@ package com.ydtech.modules.ttqf.controller;
 
 
 import com.ydtech.core.page.HttpResult;
-import com.ydtech.modules.ttqf.RegularlyPaymentStatus;
 import com.ydtech.modules.ttqf.entity.response.TtqfResponse;
 import com.ydtech.modules.ttqf.entity.vo.UserWithdrawal;
 import com.ydtech.modules.ttqf.service.TtqfService;
@@ -16,15 +15,10 @@ import javax.annotation.Resource;
 public class TtqfController {
 
 
-    private static RegularlyPaymentStatus paymentStatus;
 
     @Resource
     private TtqfService ttqfService;
 
-    @Resource
-    private void setPaymentStatus(RegularlyPaymentStatus regularlyPaymentStatus){
-        paymentStatus = regularlyPaymentStatus;
-    }
 
 
     /**
@@ -110,17 +104,5 @@ public class TtqfController {
     }
 
 
-    @GetMapping("xx/{de}")
-    public String xx(@PathVariable("de")String de) throws Exception {
-        paymentStatus.updatePaymentStatus(de);
-        return "";
-    }
-
-
-    @GetMapping("aa")
-    public void getss() throws Exception {
-
-    }
-
 
 }

src/main/java/com/ydtech/modules/ttqf/entity/vo/UserWithdrawal.java

@@ -13,9 +13,10 @@ public class UserWithdrawal {
 
     private String userId;
 
-
     private BigDecimal amount;
 
     private String remarks;
 
+    private String bankNumber;
+
 }

src/main/java/com/ydtech/modules/ttqf/service/impl/TtqfServiceImpl.java

@@ -4,20 +4,24 @@ import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ipaynow.jiaxin.domain.QueryPresignResultModel;
 import com.ipaynow.jiaxin.response.BillDownloadResponse;
 import com.ipaynow.jiaxin.response.ReceiptlDownloadResponse;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.constants.ManagementSource;
 import com.ydtech.modules.admin.dao.SysAmountAuditingMapper;
 import com.ydtech.modules.admin.dao.SysUserAccountHistoryMapper;
 import com.ydtech.modules.admin.dao.SysUserBankCardMapper;
-import com.ydtech.modules.admin.model.po.*;
+import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.admin.model.po.SysAmountAuditingEntity;
+import com.ydtech.modules.admin.model.po.SysAmountAuditingHistory;
+import com.ydtech.modules.admin.model.po.SysUserAccount;
+import com.ydtech.modules.admin.model.po.SysUserAccountHistory;
 import com.ydtech.modules.admin.model.vo.SysAmountAuditingVo;
-import com.ydtech.modules.admin.service.SysAmountAuditingHistoryService;
-import com.ydtech.modules.admin.service.SysAmountAuditingService;
-import com.ydtech.modules.admin.service.SysSwitchConfigService;
-import com.ydtech.modules.admin.service.SysUserAccountService;
+import com.ydtech.modules.admin.service.*;
 import com.ydtech.modules.lg.model.PushLgEntity;
+import com.ydtech.modules.lg.service.PushLgEntityService;
 import com.ydtech.modules.ttqf.LgInformationPush;
 import com.ydtech.modules.ttqf.PayConstantStatus;
 import com.ydtech.modules.ttqf.RetrieveTTQFApi;
@@ -84,6 +88,12 @@ public class TtqfServiceImpl implements TtqfService {
     @Autowired
     private SysAmountAuditingMapper amountAuditingMapper;
 
+    @Autowired
+    private PushLgEntityService pushLgEntityService;
+
+    @Autowired
+    private SysUserService userService;
+
     @Override
     public Object getUserPay(String userId) {
 
@@ -127,22 +137,29 @@ public class TtqfServiceImpl implements TtqfService {
         String parse = TtqfDecrypt.parse(obj);
         if (!StringUtils.isEmpty(parse)){
             PaymentNoticeEntity noticeEntity = JSONObject.parseObject(parse, PaymentNoticeEntity.class);
-            noticeEntity.setCreateTime(new Date());
-            noticeMapper.insert(noticeEntity);
+            if (null != noticeEntity){
+                LambdaQueryWrapper<PaymentNoticeEntity> paymentNoticeEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
+                paymentNoticeEntityLambdaQueryWrapper.eq(PaymentNoticeEntity::getMchOrderNo, noticeEntity.getMchOrderNo());
+                PaymentNoticeEntity notice = noticeMapper.selectOne(paymentNoticeEntityLambdaQueryWrapper);
+                if (null == notice){
+                    noticeEntity.setCreateTime(new Date());
+                    noticeMapper.insert(noticeEntity);
+                }
+            }
             LambdaQueryWrapper<PayTtqfLog> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(PayTtqfLog::getMchOrderNo, noticeEntity.getMchOrderNo());
             PayTtqfLog ttqfLog = logMapper.selectOne(wrapper);
             SysAmountAuditingVo amountAuditingVo = new SysAmountAuditingVo();
             amountAuditingVo.setAmount(noticeEntity.getAmount());
             amountAuditingVo.setUserId(ttqfLog.getUserId());
-            writeRecord(amountAuditingVo,ttqfLog.getSysAmountAuditingId());
+            writeRecord(amountAuditingVo,ttqfLog.getSysAmountAuditingId(),noticeEntity.getFeeAmount());
         }
         log.info("接收打款通知回调 + paymentNotice ================={}", parse);
         return TtqfResponse.ok();
     }
 
 
-    public void writeRecord(SysAmountAuditingVo sysAmountAuditingVo,String id){
+    public void writeRecord(SysAmountAuditingVo sysAmountAuditingVo,String id,BigDecimal feeAmount){
         SysAmountAuditingEntity sysAmountAuditingEntity = sysAmountAuditingService.getById(id);
         if (ObjectUtils.isEmpty(sysAmountAuditingEntity)){
             return;
@@ -152,43 +169,22 @@ public class TtqfServiceImpl implements TtqfService {
         BigDecimal amount = sysAmountAuditingVo.getAmount();
         //提现人
         String userId = sysAmountAuditingVo.getUserId();
-//        SysUserAccount sysUserAccountEntity = new SysUserAccount();
-//      用户扣减金额
+        //      用户扣减金额
         if (StringUtils.isNotEmpty(userId)) {
-//            sysUserAccountEntity.setUserId(userId);
             //提现人账户
             SysUserAccount sysUserAccount = sysUserAccountService.getById(userId);
             if (ObjectUtils.isNotEmpty(sysUserAccount)) {
-                //注释掉原先按类型提现的逻辑 ，改为不区分类型  add by hxl  2024-06-18
-                /**
-                 String amountStatus = sysAmountAuditingVo.getAmountStatus();
-                 if (StringUtils.isNotEmpty(amountStatus)) {
-                 if ("1".equals(amountStatus)) {
-                 sysUserAccount.setHandlingAmountAccount(amount);
-                 sysUserAccount.setHandlingAmountPayment(sysUserAccount.getHandlingAmountPayment().subtract(amount));
-                 //                        sysUserAccountEntity.setHandlingFee(afterAmount);
-                 } else if ("2".equals(amountStatus)) {
-                 sysUserAccount.setDocumentaryAmountAccount(amount);
-                 sysUserAccount.setDocumentaryAmountpayment(sysUserAccount.getDocumentaryAmountpayment().subtract(amount));
-                 //                        sysUserAccountEntity.setDocumentary(afterAmount);
-                 } else {
-                 sysUserAccount.setPromotionAmountAccount(amount);
-                 sysUserAccount.setPromotionAmountPayment(sysUserAccount.getPromotionAmountPayment().subtract(amount));
-                 //                        sysUserAccountEntity.setPromotion(afterAmount);
-                 }
-
-                 }
-                 **/
                 //已到账金额 =  原先的到账金额+ 已到账的金额
                 sysUserAccount.setSumAmountAccount((sysUserAccount.getSumAmountAccount() == null ? BigDecimal.ZERO : sysUserAccount.getSumAmountAccount()).add(amount));
                 //支付中的金额 = 原先的支付金额 -去提现的金额
                 sysUserAccount.setSumAmountPayment((sysUserAccount.getSumAmountPayment() == null ? BigDecimal.ZERO : sysUserAccount.getSumAmountPayment()).subtract(amount));
-
                 sysUserAccountService.updateById(sysUserAccount);
             }
             sysAmountAuditingVo.setAuditingStatus("3");
-            //sysAmountAuditingVo.setAuditingUserId(BaseController.getUser().getId());
             sysAmountAuditingVo.setAuditingTime(new Date());
+            sysAmountAuditingVo.setBankNumber(sysAmountAuditingEntity.getBankNumber());
+            sysAmountAuditingVo.setUserName(userService.getByUserId(sysAmountAuditingEntity.getUserId()).getName());
+            sysAmountAuditingVo.setUserId(sysAmountAuditingEntity.getUserId());
             BeanUtils.copyProperties(sysAmountAuditingVo, sysAmountAuditingEntity);
             sysAmountAuditingEntity.setCreateTime(null);
             amountAuditingMapper.updateById(sysAmountAuditingEntity);
@@ -201,6 +197,7 @@ public class TtqfServiceImpl implements TtqfService {
             //插入轨迹表
             SysAmountAuditingHistory sysAmountAuditingHistory = new SysAmountAuditingHistory(null, sysAmountAuditingEntity.getId(), amount, userId, new Date(), "4", "1", sysUserAccountHistory.getId());
             sysAmountAuditingHistoryService.save(sysAmountAuditingHistory);
+            sendCollect(sysAmountAuditingEntity,sysAmountAuditingHistory.getAuditingStatus(),feeAmount);
         }
     }
 
@@ -228,19 +225,19 @@ public class TtqfServiceImpl implements TtqfService {
         if (!sysSwitchConfigService.getBalanceExtractStatus()){
             return HttpResult.ok(WithdrawalFRes.builder().bizCode("0").msg("").url("").build());
         }
-        SysUserBankCard bankCard = SpringUtil.getBean(SysUserBankCardMapper.class).selectByIdPay(withdrawal.getUserId());
-        if (Objects.isNull(bankCard)){
+        SysUser sysUser = SpringUtil.getBean(SysUserBankCardMapper.class).selectByIdPay(withdrawal.getUserId());
+        if (Objects.isNull(sysUser)){
             return HttpResult.error("用户不存在，请检查");
         }
-        if (StringUtils.isEmpty(bankCard.getIdentity())){
+        if (StringUtils.isEmpty(sysUser.getIdentity())){
             return HttpResult.error("用户身份证号不存在，请检查");
         }
-        if (!ManagementSource.MS_02.getCode().equals(bankCard.getManagementSource())){
+        if (!ManagementSource.MS_02.getCode().equals(sysUser.getManagementSource())){
             return HttpResult.ok(WithdrawalFRes.builder().bizCode("0").msg("").url("").build());
         }
-        PayUserSign payUserSign = signService.selectOne(bankCard.getIdentity(),bankCard.getUserId());
+        PayUserSign payUserSign = signService.selectOne(sysUser.getIdentity(),sysUser.getId());
         if (!Objects.isNull(payUserSign)){
-            String signUrl = RetrieveTTQFApi.contractH5(bankCard.getIdentity());
+            String signUrl = RetrieveTTQFApi.contractH5(sysUser.getIdentity());
             if (Objects.equals(PayConstantStatus.SIGN_STATUS,payUserSign.getSign()) &&
                     Objects.equals(PayConstantStatus.AUTH_STATUS,payUserSign.getAuthStatus())){
 
@@ -249,7 +246,12 @@ public class TtqfServiceImpl implements TtqfService {
             return HttpResult.ok(WithdrawalFRes.builder().bizCode("2").msg("签约中").url(signUrl).build());
         }
         try {
-            boolean sign = RetrieveTTQFApi.queryPressing(bankCard.getIdentity());
+            boolean sign = false;
+            QueryPresignResultModel resultModel = RetrieveTTQFApi.queryPressing(sysUser.getIdentity());
+            if (Objects.equals(PayConstantStatus.SIGN_STATUS,resultModel.getSignStatus()) &&
+                    Objects.equals(PayConstantStatus.AUTH_STATUS,resultModel.getAuthStatus())){
+                sign = true;
+            }
             return HttpResult.ok(WithdrawalFRes.builder().bizCode(sign ? "3" : "1").url("").msg(sign ? "已签约" : "未签约").build());
         }catch (Exception e){
             log.info("查询签约状态异常：{}", e.getMessage());
@@ -259,55 +261,59 @@ public class TtqfServiceImpl implements TtqfService {
 
     @Override
     public HttpResult signingAddress(UserWithdrawal withdrawal) {
-        SysUserBankCard bankCard = SpringUtil.getBean(SysUserBankCardMapper.class).selectByIdPay(withdrawal.getUserId());
-        if (Objects.isNull(bankCard)){
-            return HttpResult.error("用户不存在，请检查");
-        }
-        if (StringUtils.isEmpty(bankCard.getIdentity())){
-            return HttpResult.error("用户身份证号不存在，请检查");
-        }
-        String pres = RetrieveTTQFApi.pres(bankCard);
-        if (!StringUtils.isEmpty(pres)){
-            signService.saveUserSign(bankCard.getIdentity(),bankCard.getUserId());
+        try {
+            SysUser sysUser = SpringUtil.getBean(SysUserBankCardMapper.class).selectByIdPay(withdrawal.getUserId());
+            if (Objects.isNull(sysUser)){
+                return HttpResult.error("用户不存在，请检查");
+            }
+            if (StringUtils.isEmpty(sysUser.getIdentity())){
+                return HttpResult.error("用户身份证号不存在，请检查");
+            }
+            String pres = RetrieveTTQFApi.pres(sysUser, withdrawal);
+            if (!StringUtils.isEmpty(pres)){
+                signService.saveUserSign(sysUser.getIdentity(),sysUser.getId());
+            }
+            return HttpResult.ok(WithdrawalFRes.builder().bizCode("").url(pres).msg("").build());
+        }catch (Exception e){
+            log.error("获取用户签约信息异常{}",e.getMessage());
+            throw new SystemException("提现申请提交失败");
         }
-        return HttpResult.ok(WithdrawalFRes.builder().bizCode("").url(pres).msg("").build());
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public HttpResult userCashOut(UserWithdrawal withdrawal) {
-        SysUserBankCard bankCard = SpringUtil.getBean(SysUserBankCardMapper.class).selectByIdPay(withdrawal.getUserId());
-        if (Objects.isNull(bankCard)){
-            return HttpResult.error("用户不存在，请检查");
-        }
-        if (StringUtils.isEmpty(bankCard.getIdentity())){
-            return HttpResult.error("用户身份证号不存在，请检查");
-        }
-        if (!ManagementSource.MS_02.getCode().equals(bankCard.getManagementSource())){
-            return HttpResult.error("用户不是个代，请线下申请提现");
-        }
-        boolean balance = RetrieveTTQFApi.extractBalance(bankCard, withdrawal);
-        if (balance){
-            //推送提现记录
-            sendCollect( bankCard, withdrawal);
+        try {
+            SysUser sysUser = SpringUtil.getBean(SysUserBankCardMapper.class).selectByIdPay(withdrawal.getUserId());
+            if (Objects.isNull(sysUser)){
+                return HttpResult.error("用户不存在，请检查");
+            }
+            if (StringUtils.isEmpty(sysUser.getIdentity())){
+                return HttpResult.error("用户身份证号不存在，请检查");
+            }
+            if (!ManagementSource.MS_02.getCode().equals(sysUser.getManagementSource())){
+                return HttpResult.error("用户不是个代，请线下申请提现");
+            }
+            boolean balance = RetrieveTTQFApi.extractBalance(sysUser, withdrawal);
+            return HttpResult.ok(balance);
+        }catch (Exception e){
+            log.error("提现申请提交失败{}",e.getMessage());
+            throw new RuntimeException("提现申请提交失败");
         }
-        return HttpResult.ok(balance);
     }
 
 
-    public void sendCollect(SysUserBankCard bankCard,UserWithdrawal withdrawal){
+    public void sendCollect(SysAmountAuditingEntity sysAmountAuditingEntity,String auditingStatus,BigDecimal feeAmount ){
         PushLgEntity lgEntity = new PushLgEntity();
-
-        SysAmountAuditingVo sysAmountAuditingVo = new SysAmountAuditingVo();
-        sysAmountAuditingVo.setId("");
-        sysAmountAuditingVo.setUserId(bankCard.getUserId());
-        sysAmountAuditingVo.setBankNumber(bankCard.getBankNumber());
-        sysAmountAuditingVo.setAmount(withdrawal.getAmount());
-        sysAmountAuditingVo.setCreateTime(new Date());
-        sysAmountAuditingVo.setAuditingStatus("");
-        sysAmountAuditingVo.setUserName(bankCard.getUserName());
-        sysAmountAuditingVo.setMobile(bankCard.getMobile());
-        //sendCollectUtils.sendCollect(sysAmountAuditingVo);
+        lgEntity.setApplicationTime(new Date());
+        lgEntity.setBusinessUmber(sysAmountAuditingEntity.getId());
+        lgEntity.setPayee(sysAmountAuditingEntity.getUserName());
+        lgEntity.setPayeeId(sysAmountAuditingEntity.getUserId());
+        lgEntity.setReceivingAccount(sysAmountAuditingEntity.getBankNumber());
+        lgEntity.setExtractMoney(sysAmountAuditingEntity.getAmount());
+        lgEntity.setServiceCharge(feeAmount);
+        lgEntity.setExtractStatus(auditingStatus);
+        pushLgEntityService.sendLgData(lgEntity);
     }
 
 

src/main/java/com/ydtech/utils/scheduledFutureUtil/ScheduledFutureHolder.java

@@ -0,0 +1,48 @@
+package com.ydtech.utils.scheduledFutureUtil;
+
+import java.util.concurrent.ScheduledFuture;
+
+/**
+ * 任务执行的包装类
+ */
+public class ScheduledFutureHolder {
+    private ScheduledFuture<?> scheduledFuture;
+
+    private Class<? extends Runnable> runnableClass;
+
+    private String corn;
+
+    public ScheduledFuture<?> getScheduledFuture() {
+        return scheduledFuture;
+    }
+
+    public void setScheduledFuture(ScheduledFuture<?> scheduledFuture) {
+        this.scheduledFuture = scheduledFuture;
+    }
+
+    public Class<? extends Runnable> getRunnableClass() {
+        return runnableClass;
+    }
+
+    public void setRunnableClass(Class<? extends Runnable> runnableClass) {
+        this.runnableClass = runnableClass;
+    }
+
+    public String getCorn() {
+        return corn;
+    }
+
+    public void setCorn(String corn) {
+        this.corn = corn;
+    }
+
+    @Override
+    public String toString() {
+        return "ScheduledFutureHolder{" +
+                "scheduledFuture=" + scheduledFuture +
+                ", runnableClass=" + runnableClass +
+                ", corn='" + corn + '\'' +
+                '}';
+    }
+}
+

src/main/java/com/ydtech/utils/scheduledFutureUtil/ScheduledFutureUtil.java

@@ -0,0 +1,40 @@
+package com.ydtech.utils.scheduledFutureUtil;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+import org.springframework.scheduling.support.CronTrigger;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.concurrent.ScheduledFuture;
+
+@Slf4j
+@Component
+public class ScheduledFutureUtil {
+    //存储任务执行的包装类
+    public static HashMap<String, ScheduledFutureHolder> scheduleMap = new HashMap<>();
+    @Autowired
+    private ThreadPoolTaskScheduler threadPoolTaskScheduler;
+
+    public  void startJob(Runnable runnable, String cron) {
+        //将任务交给任务调度器执行
+        ScheduledFuture<?> schedule = threadPoolTaskScheduler.schedule(runnable, new CronTrigger(cron));
+        //将任务包装成ScheduledFutureHolder
+        ScheduledFutureHolder scheduledFutureHolder = new ScheduledFutureHolder();
+        scheduledFutureHolder.setScheduledFuture(schedule);
+        scheduledFutureHolder.setRunnableClass(runnable.getClass());
+        scheduledFutureHolder.setCorn(cron);
+        scheduleMap.put(scheduledFutureHolder.getRunnableClass().getName(), scheduledFutureHolder);
+    }
+
+    public void endJob(String className){
+        if(ScheduledFutureUtil.scheduleMap.containsKey(className)){//如果包含这个任务
+            ScheduledFuture<?> scheduledFuture = ScheduledFutureUtil.scheduleMap.get(className).getScheduledFuture();
+            if(scheduledFuture!=null){
+                scheduledFuture.cancel(true);
+                log.info("{}任务已停止",className);
+            }
+        }
+    }
+}

src/main/resources/application-pre.yml

@@ -445,4 +445,4 @@ ttqf:
   tokenUrl: https://test.baoxianzhanggui.com/web-api
 
 #灵活用工平台实时推送ip地址
-sendMessage-zg-yggl-IP: http://192.168.0.29:8080/
+sendMessage-zg-yggl-IP: https://test.baoxianzhanggui.com/prod-api

src/main/resources/application-prod.yml

@@ -443,4 +443,4 @@ ttqf:
   tokenUrl: https://test.baoxianzhanggui.com/web-api
 
 #灵活用工平台实时推送ip地址
-sendMessage-zg-yggl-IP: http://192.168.0.29:8080/
+sendMessage-zg-yggl-IP: https://test.baoxianzhanggui.com/prod-api

src/main/resources/application-test.yml

@@ -528,4 +528,4 @@ customer:
 httpUrl: https://test.baoxianzhanggui.com/copartnerH5/#/pages/index/result?
 
 #灵活用工平台实时推送ip地址
-sendMessage-zg-yggl-IP: http://192.168.0.29:8080/
+sendMessage-zg-yggl-IP: https://test.baoxianzhanggui.com/prod-api

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

@@ -149,7 +149,9 @@
             <if test="amountStatus !=null  and amountStatus != ''">
                 and a.amount_status=#{amountStatus}
             </if>
-
+            <if test="amountStatus !=null  and amountStatus != '' and amountStatus = 2">
+                and a.approval != 1
+            </if>
             <if test="id !=null  and id != ''">
                 and a.id=#{id}
             </if>
@@ -272,10 +274,15 @@
         left join sys_user_account_history b on a.id = b.auditiing_id
         left join sys_user su on su.id =a.user_id
         left join sys_dept sd on sd.id =su.dept_id
+        left join sys_user_bank_card bc on bc.bank_number =a.bank_number
+        and bc.user_id =a.user_id
         <where>
             <if test="vo.auditingStatus !=null  and vo.auditingStatus != ''">
                 a.auditing_status=#{vo.auditingStatus}
             </if>
+            <if test="vo.amountStatus !=null  and vo.amountStatus != '' and vo.amountStatus = 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/SysPartnerMapper.xml

@@ -73,7 +73,14 @@
         select sal.*
         from sys_partner sal
         left join sys_relation_person srp on srp.agency_leader_id=sal.user_id
-        where srp.type = 0 and srp.suggest_id = #{userId}
+        where srp.type = 0 and srp.source = 0 and srp.suggest_id = #{userId}
+    </select>
+
+    <select id="queryIndirectByLoginId" resultType="com.ydtech.modules.admin.model.SysPartner">
+        select sal.*
+        from sys_partner sal
+        left join sys_relation_person srp on srp.agency_leader_id=sal.user_id
+        where srp.type = 0 and srp.source = 1 and srp.suggest_id = #{userId}
     </select>
 
     <select id="queryPartnerById" resultType="com.ydtech.modules.admin.model.SysPartner">
@@ -81,7 +88,7 @@
         from sys_partner sal
         left join sys_relation_person srp on srp.agency_leader_id=sal.user_id
         <where>
-            srp.type = 0
+            srp.type = 0 and srp.source = 0
             <if test="userId != null and userId != '' ">
                 and srp.suggest_id = #{userId}
             </if>
@@ -200,7 +207,7 @@
             s.id,DATE_FORMAT(s.create_time, '%Y-%m-%d %H' ) as time
         FROM sys_user  s
         <where>
-            s.status in (1, 4, 5, 6, 7)
+            s.status != 0
             <if test="deptIds != null and deptIds != '' and deptIds.size() > 0">
                 AND s.dept_id  in
                 <foreach collection="deptIds" item="deptId" open="(" separator="," close=")">
@@ -225,7 +232,7 @@
             s.id,DATE_FORMAT(s.create_time, '%Y-%m-%d' ) as time
         FROM sys_user  s
         <where>
-            s.status in (1, 4, 5, 6, 7)
+            s.status != 0
             <if test="deptIds != null and deptIds != '' and deptIds.size() > 0">
                 AND s.dept_id  in
                 <foreach collection="deptIds" item="deptId" open="(" separator="," close=")">
@@ -251,7 +258,7 @@
         s.id,DATE_FORMAT(s.create_time, '%Y-%m-%d %H' ) as time
         FROM sys_user  s
         <where>
-            s.status in (1, 4, 5, 6, 7)
+            s.status != 0
             <if test="deptIds != null and deptIds != '' and deptIds.size() > 0">
                 AND s.dept_id  in
                 <foreach collection="deptIds" item="deptId" open="(" separator="," close=")">
@@ -276,7 +283,7 @@
         s.id,DATE_FORMAT(s.create_time, '%Y-%m-%d' ) as time
         FROM sys_user  s
         <where>
-            s.status in (1, 4, 5, 6, 7)
+            s.status != 0
             <if test="deptIds != null and deptIds != '' and deptIds.size() > 0">
                 AND s.dept_id  in
                 <foreach collection="deptIds" item="deptId" open="(" separator="," close=")">
@@ -304,7 +311,7 @@
         FROM sys_partner s
         left join sys_relation_person srp on srp.agency_leader_id = s.user_id
         <where>
-            s.del_flag = 1 and srp.type = 0
+            s.del_flag = 1 and srp.type = 0 and srp.source = 0
             <if test="userId != null and userId != '' ">
                 and srp.suggest_id = #{userId}
             </if>
@@ -329,7 +336,7 @@
         FROM sys_partner s
         left join sys_relation_person srp on srp.agency_leader_id = s.user_id
         <where>
-            s.del_flag = 1 and srp.type = 0
+            s.del_flag = 1 and srp.type = 0 and srp.source = 0
             <if test="userId != null and userId != '' ">
                 and srp.suggest_id = #{userId}
             </if>

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

@@ -868,12 +868,8 @@
         su.id as userId,
         su.name,
         info.sex,
-        info.live_address,
         su.mobile,
-        su.leader_id,
-        su.leader_name,
         su.status,
-        su.identity,
         sd.id as deptId,
         sd.name as deptName,
         t4.id as roleId,
@@ -905,16 +901,16 @@
         su.status != 0 AND su.id LIKE '%M%' and su.id!='admin'
         <if test='user !=null  '>
             <if test='user.name !=null and user.name!="" '>
-                and su.name like concat('%', #{user.name}, '%')
+                and su.name = #{user.name}
             </if>
             <if test='user.userId !=null and user.userId!="" '>
-                and su.id like concat('%', #{user.userId}, '%')
+                and su.id = #{user.userId}
             </if>
             <if test='user.mobile !=null and user.mobile!=""  '>
-                and su.mobile like concat('%', #{user.mobile}, '%')
+                and su.mobile = #{user.mobile}
             </if>
             <if test='user.identity !=null and user.identity!=""  '>
-                and su.identity like concat('%', #{user.identity}, '%')
+                and su.identity = #{user.identity}
             </if>
         </if>
     </select>

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

@@ -20,7 +20,6 @@
         IFNULL(a.riskCodeJshang,0) as "riskCodeJshang",
         IFNULL(a.riskCodeDs,0) as "riskCodeDs",
         IFNULL(a.riskCodeDsan,0) as "riskCodeDsan",
-        IFNULL(a.exportAllFee,0) as "exportAllFee",
         sd.management_source as "managementSource",
         IFNULL(IFNULL(a.entranceAllFee,0) -IFNULL(a.exportAllFee,0),0)  as  "distributionAmount",
         (IFNULL(IFNULL(a.entranceAllFee,0) -IFNULL(a.exportAllFee,0),0)) / a.sumpremium as "distributionAmountRate"
@@ -51,11 +50,9 @@
         LEFT JOIN ins_fee_order_new ifon ON iac.id = ifon.ins_order_no
         <where>
             iac.orderstatus = '3'
-            <if test="vo.signingTimeStart != null and vo.signingTimeStart!='' and vo.signingTimeEnd != null and vo.signingTimeEnd != ''">
-                AND DATE_FORMAT(iac.signing_time, '%Y-%m-%d') BETWEEN DATE_FORMAT(#{vo.signingTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{vo.signingTimeEnd}, '%Y-%m-%d')
-            </if>
-            <if test="vo.enterTimeStart != null and vo.enterTimeStart!='' and vo.enterTimeEnd != null and vo.enterTimeEnd != ''">
-                AND DATE_FORMAT(iac.createtime, '%Y-%m-%d') BETWEEN DATE_FORMAT(#{vo.enterTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{vo.enterTimeEnd}, '%Y-%m-%d')
+            <if test="vo.createtimeStart  != null  and  vo.createtimeStart!=''  and vo.createtimeEnd  != null  and  vo.createtimeEnd!=''">
+                AND DATE_FORMAT( iac.signing_time, '%Y-%m-%d') BETWEEN DATE_FORMAT( #{vo.createtimeStart}, '%Y-%m-%d')
+                AND DATE_FORMAT( #{vo.createtimeEnd}, '%Y-%m-%d')
             </if>
 
             <if test="vo.userIds  !=null  and vo.userIds!=''  and vo.userIds.size()>0">
@@ -182,11 +179,9 @@
                  LEFT JOIN ins_fee_order_new ifon ON iac.id = ifon.ins_order_no
         <where>
         iac.orderstatus = '3'
-            <if test="vo.signingTimeStart != null and vo.signingTimeStart!='' and vo.signingTimeEnd != null and vo.signingTimeEnd != ''">
-                AND DATE_FORMAT(iac.signing_time, '%Y-%m-%d') BETWEEN DATE_FORMAT(#{vo.signingTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{vo.signingTimeEnd}, '%Y-%m-%d')
-            </if>
-            <if test="vo.enterTimeStart != null and vo.enterTimeStart!='' and vo.enterTimeEnd != null and vo.enterTimeEnd != ''">
-                AND DATE_FORMAT(iac.createtime, '%Y-%m-%d') BETWEEN DATE_FORMAT(#{vo.enterTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{vo.enterTimeEnd}, '%Y-%m-%d')
+            <if test="vo.createtimeStart  != null  and  vo.createtimeStart!=''  and vo.createtimeEnd  != null  and  vo.createtimeEnd!=''">
+                AND DATE_FORMAT( iac.signing_time, '%Y-%m-%d') BETWEEN DATE_FORMAT( #{vo.createtimeStart}, '%Y-%m-%d') AND
+                DATE_FORMAT( #{vo.createtimeEnd}, '%Y-%m-%d')
             </if>
 
             <if test="vo.days !=null  and vo.days !=''  and vo.days != 0 ">
@@ -235,11 +230,9 @@
         <where>
              1=1
            and  iac.orderstatus ='3'
-            <if test="vo.signingTimeStart != null and vo.signingTimeStart!='' and vo.signingTimeEnd != null and vo.signingTimeEnd != ''">
-                AND DATE_FORMAT(iac.signing_time, '%Y-%m-%d') BETWEEN DATE_FORMAT(#{vo.signingTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{vo.signingTimeEnd}, '%Y-%m-%d')
-            </if>
-            <if test="vo.enterTimeStart != null and vo.enterTimeStart!='' and vo.enterTimeEnd != null and vo.enterTimeEnd != ''">
-                AND DATE_FORMAT(iac.createtime, '%Y-%m-%d') BETWEEN DATE_FORMAT(#{vo.enterTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{vo.enterTimeEnd}, '%Y-%m-%d')
+            <if test="vo.createtimeStart  != null  and  vo.createtimeStart!=''  and vo.createtimeEnd  != null  and  vo.createtimeEnd!=''">
+                AND DATE_FORMAT( iac.signing_time, '%Y-%m-%d') BETWEEN DATE_FORMAT( #{vo.createtimeStart}, '%Y-%m-%d') AND
+                DATE_FORMAT( #{vo.createtimeEnd}, '%Y-%m-%d')
             </if>
 
             <if test="vo.userName !=null  and vo.userName!=''">
@@ -313,11 +306,9 @@
                 and su.id=#{vo.userId}
             </if>
 
-            <if test="vo.signingTimeStart != null and vo.signingTimeStart!='' and vo.signingTimeEnd != null and vo.signingTimeEnd != ''">
-                AND DATE_FORMAT(iac.signing_time, '%Y-%m-%d') BETWEEN DATE_FORMAT(#{vo.signingTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{vo.signingTimeEnd}, '%Y-%m-%d')
-            </if>
-            <if test="vo.enterTimeStart != null and vo.enterTimeStart!='' and vo.enterTimeEnd != null and vo.enterTimeEnd != ''">
-                AND DATE_FORMAT(iac.createtime, '%Y-%m-%d') BETWEEN DATE_FORMAT(#{vo.enterTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{vo.enterTimeEnd}, '%Y-%m-%d')
+            <if test="vo.createtimeStart  != null  and  vo.createtimeStart!=''  and vo.createtimeEnd  != null  and  vo.createtimeEnd!=''">
+                AND DATE_FORMAT( iac.signing_time, '%Y-%m-%d') BETWEEN DATE_FORMAT( #{vo.createtimeStart}, '%Y-%m-%d') AND
+                DATE_FORMAT( #{vo.createtimeEnd}, '%Y-%m-%d')
             </if>
 
             <if test="vo.managementSource !=null  and vo.managementSource!=''">
@@ -425,93 +416,6 @@
         iac.inscompany
     </select>
 
-    <resultMap id="OrderDataMap" type="com.ydtech.modules.admin.model.vo.BusinessOrderData">
-        <result property="totalNumber" column="total"/>
-        <result property="orderNo"     column="order_no"/>
-        <result property="carNum"      column="car_num"/>
-        <result property="sumPremium"  column="sum_premium"/>
-        <result property="jqPremium"   column="jq_premium"/>
-        <result property="syPremium"   column="sy_premium"/>
-        <result property="taxAmount"   column="tax_amount"/>
-        <result property="jyPremium"   column="jy_premium"/>
-        <result property="userId"      column="user_id"/>
-        <result property="userName"    column="user_name"/>
-    </resultMap>
-
-    <sql id="BusinessOrderDataSQL">
-        SELECT
-            io.orderno AS "order_no",
-            io.licenseno AS "car_num",
-            su.id AS "user_id",
-            su.name AS "user_name",
-            IFNULL(sum(jqpremium), 0) AS "jq_premium",
-            IFNULL(sum(sypremium), 0) AS "sy_premium",
-            IFNULL(sum(taxamount), 0) AS "tax_amount",
-            IFNULL(sum(jypremium), 0) AS "jy_premium",
-            (IFNULL(sum(jqpremium), 0) + IFNULL(sum(sypremium), 0) + IFNULL(sum(jypremium), 0)) AS "sum_premium",
-            ROUND(sum(IFNULL(ifon.jq_costs_premiums, 0) + IFNULL(ifon.sy_costs_premiums, 0)
-                + IFNULL(ifon.no_costs_premiums, 0)), 2) AS "entrance_all_fee",
-            ROUND(sum(IFNULL(jq_export_other_costs_premiums, 0) + IFNULL(jq_export_supervise_costs_premiums, 0)
-                + IFNULL(sy_export_other_costs_premiums, 0) + IFNULL(sy_export_supervise_costs_premiums, 0)
-                + IFNULL(no_export_other_costs_premiums, 0) + IFNULL(no_export_supervise_costs_premiums, 0)), 2) AS "export_all_fee"
-        FROM ins_area_company iac
-                 LEFT JOIN ins_orders io ON io.orderno = iac.orderno
-                 LEFT JOIN sys_user su ON io.userid = su.id
-                 LEFT JOIN ins_fee_order_new ifon ON iac.id = ifon.ins_order_no
-    </sql>
 
-    <select id="getBusinessOrderDataDetails" resultMap="OrderDataMap">
-        <include refid="BusinessOrderDataSQL"/>
-        <where>
-            iac.orderstatus = '3'
-            AND io.orderstatus = '3'
-            <if test="vo.userId != null and vo.userId!=''">
-                AND su.id = #{vo.userId}
-            </if>
-            <if test="vo.signingTimeStart != null and vo.signingTimeStart!='' and vo.signingTimeEnd != null and vo.signingTimeEnd != ''">
-                AND DATE_FORMAT(iac.signing_time, '%Y-%m-%d') BETWEEN DATE_FORMAT(#{vo.signingTimeStart}, '%Y-%m-%d')
-                AND DATE_FORMAT(#{vo.signingTimeEnd}, '%Y-%m-%d')
-            </if>
-            <if test="vo.enterTimeStart != null and vo.enterTimeStart!='' and vo.enterTimeEnd != null and vo.enterTimeEnd != ''">
-                AND DATE_FORMAT(iac.createtime, '%Y-%m-%d') BETWEEN DATE_FORMAT(#{vo.enterTimeStart}, '%Y-%m-%d')
-                AND DATE_FORMAT(#{vo.enterTimeEnd}, '%Y-%m-%d')
-            </if>
-        </where>
-        GROUP BY
-            io.orderno
-    </select>
-
-    <select id="getBusinessOrderDataTotal" resultMap="OrderDataMap">
-        SELECT
-            count(*) AS `total`,
-            IFNULL(SUM(a.jq_premium), 0) AS `jq_premium`,
-            IFNULL(SUM(a.sy_premium), 0) AS `sy_premium`,
-            IFNULL(SUM(a.tax_amount), 0) AS `tax_amount`,
-            IFNULL(SUM(a.jy_premium), 0) AS `jy_premium`,
-            sum(IFNULL(a.jq_premium, 0) + IFNULL(a.sy_premium, 0) + IFNULL(a.jy_premium, 0)) as `sum_premium`,
-            IFNULL(SUM(a.entrance_all_fee), 0) AS `entrance_all_fee`,
-            IFNULL(SUM(a.export_all_fee), 0) AS `export_all_fee`
-        FROM (
-        <include refid="BusinessOrderDataSQL"/>
-        <where>
-                iac.orderstatus = '3'
-                AND io.orderstatus = '3'
-                <if test="vo.userId != null and vo.userId!=''">
-                    AND su.id = #{vo.userId}
-                </if>
-                <if test="vo.signingTimeStart != null and vo.signingTimeStart!='' and vo.signingTimeEnd != null and vo.signingTimeEnd != ''">
-                    AND DATE_FORMAT(iac.signing_time, '%Y-%m-%d') BETWEEN DATE_FORMAT(#{vo.signingTimeStart}, '%Y-%m-%d')
-                    AND DATE_FORMAT(#{vo.signingTimeEnd}, '%Y-%m-%d')
-                </if>
-                <if test="vo.enterTimeStart != null and vo.enterTimeStart!='' and vo.enterTimeEnd != null and vo.enterTimeEnd != ''">
-                    AND DATE_FORMAT(iac.createtime, '%Y-%m-%d') BETWEEN DATE_FORMAT(#{vo.enterTimeStart}, '%Y-%m-%d')
-                    AND DATE_FORMAT(#{vo.enterTimeEnd}, '%Y-%m-%d')
-                </if>
-            </where>
-            GROUP BY
-                io.orderno) a
-        GROUP BY
-            a.user_id
-    </select>
 
 </mapper>

src/main/resources/mapper/modules/esm/EsmUserImageMapper.xml

@@ -23,7 +23,7 @@
     </sql>
 
     <select id="selectEsmUserImageQueryVo" resultMap="EsmUserImageQueryVo">
-        select i.type, i.images_id, f.file_path as url
+        select i.type, i.images_id, f.url
         from esm_user_image as i
                  left join ins_upload_files as f
                            on i.images_id = f.id

src/main/resources/mapper/modules/fnc/InsPlyIncomeMapper.xml

@@ -314,7 +314,7 @@
                 AND  a.create_time =#{createTime}
             </if>
             <if test="settlementTime !=null  and  settlementTime  !=''">
-                AND a.settlement_time =#{settlementTime}
+                and DATE_FORMAT( a.settlement_time, '%Y-%m-%d')  = DATE_FORMAT(#{settlementTime}, '%Y-%m-%d')
             </if>
 
             <if test="settlementDate !=null  and  settlementDate  !=''">
@@ -639,7 +639,7 @@
                 AND  a.create_time =#{createTime}
             </if>
             <if test="settlementTime !=null  and  settlementTime  !=''">
-                AND a.settlement_time =#{settlementTime}
+                and DATE_FORMAT( a.settlement_time, '%Y-%m-%d')  = DATE_FORMAT(#{settlementTime}, '%Y-%m-%d')
             </if>
 
             <if test="settlementDate !=null  and  settlementDate  !=''">
@@ -836,7 +836,7 @@
                     a.create_time =#{createTime}
                 </if>
                 <if test="settlementTime !=null  and  settlementTime  !=''">
-                    a.settlement_time =#{settlementTime}
+                    and DATE_FORMAT( a.settlement_time, '%Y-%m-%d')  = DATE_FORMAT(#{settlementTime}, '%Y-%m-%d')
                 </if>
 
                 <if test="userId !=null  and  userId  !=''">
@@ -971,7 +971,7 @@
                    AND a.create_time =#{createTime}
                 </if>
                 <if test="settlementTime !=null  and  settlementTime  !=''">
-                   AND a.settlement_time =#{settlementTime}
+                    and DATE_FORMAT( a.settlement_time, '%Y-%m-%d')  = DATE_FORMAT(#{settlementTime}, '%Y-%m-%d')
                 </if>
 
                 <if test="partnerCompaniesName !=null  and  partnerCompaniesName  !=''">
@@ -1116,7 +1116,7 @@
                    AND a.create_time =#{createTime}
                 </if>
                 <if test="settlementTime !=null  and  settlementTime  !=''">
-                   AND a.settlement_time =#{settlementTime}
+                    and DATE_FORMAT( a.settlement_time, '%Y-%m-%d')  = DATE_FORMAT(#{settlementTime}, '%Y-%m-%d')
                 </if>
 
                 <if test="partnerCompaniesName !=null  and  partnerCompaniesName  !=''">
@@ -1266,7 +1266,7 @@
             </if>
 
             <if test="settlementTime !=null  and  settlementTime  !=''">
-                and  a.settlement_time =#{settlementTime}
+                and DATE_FORMAT( a.settlement_time, '%Y-%m-%d')  = DATE_FORMAT(#{settlementTime}, '%Y-%m-%d')
             </if>
 
             <if test="createTimeStart  !=null  and  createTimeStart  != ''  and  createTimeEnd   != null  and  createTimeEnd   !=''">
@@ -1437,7 +1437,7 @@
                 AND  a.create_time =#{createTime}
             </if>
             <if test="settlementTime !=null  and  settlementTime  !=''">
-                AND a.settlement_time =#{settlementTime}
+                and DATE_FORMAT( a.settlement_time, '%Y-%m-%d')  = DATE_FORMAT(#{settlementTime}, '%Y-%m-%d')
             </if>
 
             <if test="userId !=null  and  userId  !=''">
@@ -1631,7 +1631,7 @@
                 AND  a.create_time =#{createTime}
             </if>
             <if test="settlementTime !=null  and  settlementTime  !=''">
-                AND a.settlement_time =#{settlementTime}
+                and DATE_FORMAT( a.settlement_time, '%Y-%m-%d')  = DATE_FORMAT(#{settlementTime}, '%Y-%m-%d')
             </if>
             <if test="createTimeQuery != null and createTimeQuery != ''">
                 and DATE_FORMAT( a.create_time, '%Y-%m-%d')   =#{createTimeQuery}
@@ -1900,7 +1900,7 @@
                        AND  a.create_time =#{createTime}
                    </if>
                    <if test="settlementTime !=null  and  settlementTime  !=''">
-                       AND a.settlement_time =#{settlementTime}
+                       and DATE_FORMAT( a.settlement_time, '%Y-%m-%d')  = DATE_FORMAT(#{settlementTime}, '%Y-%m-%d')
                    </if>
 
                    <if test="userId !=null  and  userId  !=''">
@@ -1974,7 +1974,7 @@
         SELECT
             DATE_FORMAT(a.settlement_time, '%Y-%m-%d %H:%i:%s') as "settlementTime",
             MAX(upf.url) as "imageUrl",
-            sum(a.commission_feevalue + a.other_feevalue) AS "settlementAmount"
+            sum(IFNULL(a.commission_feevalue,0) + IFNULL(a.other_feevalue,0)) AS "settlementAmount"
         FROM
             ins_ply_income a
             LEFT  JOIN  ptl_agreement  pa  on  a.agreement_id  = pa.id
@@ -2151,7 +2151,7 @@
                 AND  a.create_time =#{createTime}
             </if>
             <if test="settlementTime !=null  and  settlementTime  !=''">
-                AND a.settlement_time =#{settlementTime}
+                and DATE_FORMAT( a.settlement_time, '%Y-%m-%d')  = DATE_FORMAT(#{settlementTime}, '%Y-%m-%d')
             </if>
 
             <if test="settlementDate !=null  and  settlementDate  !=''">
@@ -2353,7 +2353,7 @@
                 AND  a.create_time =#{createTime}
             </if>
             <if test="settlementTime !=null  and  settlementTime  !=''">
-                AND a.settlement_time =#{settlementTime}
+                and DATE_FORMAT( a.settlement_time, '%Y-%m-%d')  = DATE_FORMAT(#{settlementTime}, '%Y-%m-%d')
             </if>
 
             <if test="settlementDate !=null  and  settlementDate  !=''">
@@ -3379,7 +3379,7 @@
                 AND  a.create_time =#{createTime}
             </if>
             <if test="settlementTime !=null  and  settlementTime  !=''">
-                AND a.settlement_time =#{settlementTime}
+                and DATE_FORMAT( a.settlement_time, '%Y-%m-%d')  = DATE_FORMAT(#{settlementTime}, '%Y-%m-%d')
             </if>
 
             <if test="userId !=null  and  userId  !=''">