app提现记录

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

@@ -105,14 +105,7 @@ public class SysAgencyFeeApprovalController extends BaseController {
         return HttpResult.ok(this.sysAgencyFeeApprovalService.queryOperate(id));
     }
 
-    /**
-     * 线下转账，线上确认提现
-     */
-    @ApiOperation(value = "线下转账，线上确认提现")
-    @PostMapping("/confirmAccounts")
-    public HttpResult confirmAccounts(@RequestBody SysAgencyFeeApprovalEditDto sysAgencyFeeApprovalEditDto) {
-        return HttpResult.ok(this.sysAgencyFeeApprovalService.confirmAccounts(sysAgencyFeeApprovalEditDto));
-    }
+
 
     @ApiOperation(value = "当前用户的提现记录")
     @PostMapping("/queryOperateInfo")

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

@@ -31,8 +31,6 @@ public interface SysAgencyFeeApprovalService extends IService<SysAgencyFeeApprov
 
     List<SysAgencyFeeApprovalRecord> queryOperate(Integer id);
 
-    boolean confirmAccounts(SysAgencyFeeApprovalEditDto sysAgencyFeeApprovalEditDto);
-
     List<SysAgencyFeeApproval> queryOperateInfo(SysAgencyFeeApprovalDto sysAgencyFeeApprovalDto);
 
     SysAgencyFeeApprovalRecordVo operateInfo(Integer id);

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

@@ -121,19 +121,22 @@ public class SysAgencyFeeApprovalServiceImpl extends ServiceImpl<SysAgencyFeeApp
     @Override
     @Transactional(rollbackFor = Exception.class)
     public HttpResult edit(SysAgencyFeeApprovalEditDto sysAgencyFeeApprovalEditDto) {
-        SysAgencyFeeApproval sysAgencyFeeApproval = sysAgencyFeeApprovalMapper.selectById(sysAgencyFeeApprovalEditDto.getId());
-        String status = sysAgencyFeeApproval.getStatus();
-        if (status.equals("1") || status.equals("2")) {
-            throw new DescribeException("已审批，不可重复操作");
+        SysAgencyFeeApproval sysAgencyFeeApproval = new SysAgencyFeeApproval();
+        String status = sysAgencyFeeApprovalEditDto.getStatus();
+        if (StringUtils.isNullOrEmpty(status) && status.equals("1")) {
+            //审批通过
+            sysAgencyFeeApproval.setHistoryFee(sysAgencyFeeApproval.getCashFee());
+            sysAgencyFeeApproval.setPicture(sysAgencyFeeApprovalEditDto.getPicture());
         }
         sysAgencyFeeApproval.setAuditTime(new Date());
         sysAgencyFeeApproval.setRemark(sysAgencyFeeApprovalEditDto.getRemark());
-        sysAgencyFeeApproval.setStatus(sysAgencyFeeApprovalEditDto.getStatus());
+        sysAgencyFeeApproval.setStatus(status);
         sysAgencyFeeApproval.setAuditUser(BaseController.getUser().getName());
         //保存审批信息
         sysAgencyFeeApprovalMapper.updateById(sysAgencyFeeApproval);
+        SysAgencyFeeApproval sysAgencyFeeApproval1 = sysAgencyFeeApprovalMapper.selectById(sysAgencyFeeApprovalEditDto.getId());
         //保存审批记录
-        SysAgencyFeeApprovalRecord sysAgencyFeeApprovalRecord = BeanUtil.copyProperties(sysAgencyFeeApproval, SysAgencyFeeApprovalRecord.class);
+        SysAgencyFeeApprovalRecord sysAgencyFeeApprovalRecord = BeanUtil.copyProperties(sysAgencyFeeApproval1, SysAgencyFeeApprovalRecord.class);
         sysAgencyFeeApprovalRecord.setApprovalId(sysAgencyFeeApproval.getId());
         sysAgencyFeeApprovalRecord.setId(null);
         sysAgencyFeeApprovalRecord.setCreateTime(new Date());
@@ -166,24 +169,6 @@ public class SysAgencyFeeApprovalServiceImpl extends ServiceImpl<SysAgencyFeeApp
                 .eq(SysAgencyFeeApprovalRecord::getApprovalId, id));
     }
 
-    @Override
-    public boolean confirmAccounts(SysAgencyFeeApprovalEditDto sysAgencyFeeApprovalEditDto) {
-        SysAgencyFeeApproval sysAgencyFeeApproval = sysAgencyFeeApprovalMapper.selectById(sysAgencyFeeApprovalEditDto.getId());
-        if (sysAgencyFeeApproval.getStatus().equals("0") || sysAgencyFeeApproval.getStatus().equals("2")) {
-            throw new DescribeException("未审批或审批未通，不可确认转账");
-        }
-        sysAgencyFeeApproval.setHistoryFee(sysAgencyFeeApproval.getCashFee());
-        sysAgencyFeeApproval.setPicture(sysAgencyFeeApprovalEditDto.getPicture());
-        sysAgencyFeeApprovalMapper.updateById(sysAgencyFeeApproval);
-        //保存确认转账记录
-        SysAgencyFeeApprovalRecord sysAgencyFeeApprovalRecord = BeanUtil.copyProperties(sysAgencyFeeApproval, SysAgencyFeeApprovalRecord.class);
-        sysAgencyFeeApprovalRecord.setApprovalId(sysAgencyFeeApproval.getId());
-        sysAgencyFeeApprovalRecord.setId(null);
-        sysAgencyFeeApprovalRecord.setCreateTime(new Date());
-        sysAgencyFeeApprovalRecord.setCreateBy(BaseController.getUser().getName());
-
-        return sysAgencyFeeApprovalRecordMapper.insert(sysAgencyFeeApprovalRecord)>0;
-    }
 
     @Override
     public List<SysAgencyFeeApproval> queryOperateInfo(SysAgencyFeeApprovalDto sysAgencyFeeApprovalDto) {

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

@@ -36,6 +36,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 配置机构合伙人表(SysPartner)表服务实现类
@@ -79,6 +80,10 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
     @Override
     public BasePageResult<SysUserPartner> queryByPage(SysPartnerPageDto sysPartnerPageDto) {
         Page<SysUser> page = new Page<>(sysPartnerPageDto.getPageNum(), sysPartnerPageDto.getPageSize());
+        //查询所有四级部门
+//        List<SysDept> sysDeptList = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>()
+//                .eq(SysDept::getComlevel, 5).eq(SysDept::getDelFlag,0));
+//        List<String> idList = sysDeptList.stream().map(SysDept::getId).collect(Collectors.toList());
 
         LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(SysUser::getStatus, 1);
@@ -92,6 +97,12 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
             List<String> stringList = sysAgencyLeaders.stream().map(SysAgencyLeader::getUserId).collect(Collectors.toList());
             records = records.stream().filter(SysUser -> !stringList.contains(SysUser.getId())).collect(Collectors.toList());
         }
+//        //查询所有四级部门
+        List<SysDept> sysDeptList = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>().eq(SysDept::getComlevel, 5));
+        List<String> idList = sysDeptList.stream().map(SysDept::getId).collect(Collectors.toList());
+        if (records.size()>0) {
+            records = records.stream().filter(SysUser -> !idList.contains(SysUser.getId())).collect(Collectors.toList());
+        }
 
         List<SysUserPartner> sysUserPartners = BeanUtil.copyToList(records, SysUserPartner.class);