app提现详情

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

@@ -8,6 +8,7 @@ import com.ydtech.modules.admin.model.dto.SysAgencyFeeApprovalAddDto;
 import com.ydtech.modules.admin.model.dto.SysAgencyFeeApprovalDto;
 import com.ydtech.modules.admin.model.dto.SysAgencyFeeApprovalEditDto;
 import com.ydtech.modules.admin.model.dto.SysAgencyFeeApprovalPageDto;
+import com.ydtech.modules.admin.model.vo.SysAgencyFeeApprovalRecordVo;
 import com.ydtech.modules.admin.service.SysAgencyFeeApprovalService;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.order.entity.BasePageResult;
@@ -119,6 +120,12 @@ public class SysAgencyFeeApprovalController extends BaseController {
         return HttpResult.ok(this.sysAgencyFeeApprovalService.queryOperateInfo(sysAgencyFeeApprovalDto));
     }
 
+    @ApiOperation(value = "提现记录详情")
+    @PostMapping("/operateInfo/{id}")
+    public HttpResult<SysAgencyFeeApprovalRecordVo> operateInfo(@PathVariable("id") Integer id) {
+        return HttpResult.ok(this.sysAgencyFeeApprovalService.operateInfo(id));
+    }
+
 
 }
 

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

@@ -0,0 +1,70 @@
+package com.ydtech.modules.admin.model.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@ApiModel(value = "APP提现详情")
+public class SysAgencyFeeApprovalRecordVo {
+
+    /**
+     * 自增主键
+     */
+    @TableId(value = "id", type= IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 银行卡号
+     */
+    @TableField(value = "bank_number")
+    private String bankNumber;
+
+    /**
+     * 开户行
+     */
+    @TableField(value = "bank_account")
+    private String bankAccount;
+
+
+    @ApiModelProperty(value = "提现编号")
+    private String number;
+
+    /**
+     * 已提现抽成费用
+     */
+    @ApiModelProperty(value = "已提现抽成费用")
+    private BigDecimal historyFee;
+    /**
+     * 提现金额
+     */
+    @ApiModelProperty(value = "可提现抽成费用")
+    private BigDecimal cashFee;
+
+    /**
+     * 审核状态0未审核 1审核通过 2审核驳回
+     */
+    @ApiModelProperty(value = "审核状态0未审核 1审核通过 2审核驳回")
+    private List<String> status;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 审批意见
+     */
+    @ApiModelProperty(value = "审批意见")
+    private String remark;
+
+
+
+}

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

@@ -9,6 +9,7 @@ import com.ydtech.modules.admin.model.dto.SysAgencyFeeApprovalAddDto;
 import com.ydtech.modules.admin.model.dto.SysAgencyFeeApprovalDto;
 import com.ydtech.modules.admin.model.dto.SysAgencyFeeApprovalEditDto;
 import com.ydtech.modules.admin.model.dto.SysAgencyFeeApprovalPageDto;
+import com.ydtech.modules.admin.model.vo.SysAgencyFeeApprovalRecordVo;
 import com.ydtech.modules.order.entity.BasePageResult;
 
 import java.util.List;
@@ -33,4 +34,6 @@ public interface SysAgencyFeeApprovalService extends IService<SysAgencyFeeApprov
     boolean confirmAccounts(SysAgencyFeeApprovalEditDto sysAgencyFeeApprovalEditDto);
 
     List<SysAgencyFeeApproval> queryOperateInfo(SysAgencyFeeApprovalDto sysAgencyFeeApprovalDto);
+
+    SysAgencyFeeApprovalRecordVo operateInfo(Integer id);
 }

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

@@ -20,6 +20,7 @@ import com.ydtech.modules.admin.model.dto.SysAgencyFeeApprovalDto;
 import com.ydtech.modules.admin.model.dto.SysAgencyFeeApprovalEditDto;
 import com.ydtech.modules.admin.model.dto.SysAgencyFeeApprovalPageDto;
 import com.ydtech.modules.admin.model.vo.AgencyExtractFee;
+import com.ydtech.modules.admin.model.vo.SysAgencyFeeApprovalRecordVo;
 import com.ydtech.modules.admin.service.SysAgencyFeeApprovalService;
 import com.ydtech.modules.admin.service.SysAgencyLeaderService;
 import com.ydtech.modules.admin.service.SysDeptService;
@@ -100,8 +101,9 @@ public class SysAgencyFeeApprovalServiceImpl extends ServiceImpl<SysAgencyFeeApp
         sysAgencyFeeApproval.setProportional(agencyExtractFee.getProportional());
         sysAgencyFeeApproval.setCreateBy(user.getName());
         sysAgencyFeeApproval.setCreateTime(new Date());
+        sysAgencyFeeApproval.setStatus("0");
         //提交审核信息
-        save(sysAgencyFeeApproval);
+        this.save(sysAgencyFeeApproval);
         //保存添加记录
         SysAgencyFeeApprovalRecord sysAgencyFeeApprovalRecord = BeanUtil.copyProperties(sysAgencyFeeApproval, SysAgencyFeeApprovalRecord.class);
         sysAgencyFeeApprovalRecord.setApprovalId(sysAgencyFeeApproval.getId());
@@ -184,14 +186,28 @@ public class SysAgencyFeeApprovalServiceImpl extends ServiceImpl<SysAgencyFeeApp
     public List<SysAgencyFeeApproval> queryOperateInfo(SysAgencyFeeApprovalDto sysAgencyFeeApprovalDto) {
 
         List<SysAgencyFeeApproval> feeApprovalList = sysAgencyFeeApprovalMapper.selectList(new LambdaQueryWrapper<SysAgencyFeeApproval>()
-                .eq(SysAgencyFeeApproval::getUserId, BaseController.getUserId()).eq(SysAgencyFeeApproval::getStatus, 1)
+                .eq(SysAgencyFeeApproval::getUserId, BaseController.getUserId())
                 .ge(StringUtils.isNotEmpty(sysAgencyFeeApprovalDto.getBeginTime()), SysAgencyFeeApproval::getAuditTime,sysAgencyFeeApprovalDto.getBeginTime())
                 .le(StringUtils.isNotEmpty(sysAgencyFeeApprovalDto.getEndTime()),SysAgencyFeeApproval::getAuditTime,sysAgencyFeeApprovalDto.getEndTime()));
 
         return feeApprovalList;
     }
 
-
+    @Override
+    public SysAgencyFeeApprovalRecordVo operateInfo(Integer id) {
+        SysAgencyFeeApproval sysAgencyFeeApproval = sysAgencyFeeApprovalMapper.selectOne(new LambdaQueryWrapper<SysAgencyFeeApproval>().eq(SysAgencyFeeApproval::getId, id));
+        SysAgencyFeeApprovalRecordVo sysAgencyFeeApprovalRecordVo = BeanUtil.copyProperties(sysAgencyFeeApproval, SysAgencyFeeApprovalRecordVo.class);
+
+        List<SysAgencyFeeApprovalRecord> sysAgencyFeeApprovalRecords = sysAgencyFeeApprovalRecordMapper.selectList(new LambdaQueryWrapper<SysAgencyFeeApprovalRecord>()
+                .eq(SysAgencyFeeApprovalRecord::getApprovalId, id).orderByAsc(SysAgencyFeeApprovalRecord::getId));
+        if (sysAgencyFeeApprovalRecords.size()>0) {
+            for (SysAgencyFeeApprovalRecord sysAgencyFeeApprovalRecord : sysAgencyFeeApprovalRecords) {
+                List<String> status = sysAgencyFeeApprovalRecordVo.getStatus();
+                status.add(sysAgencyFeeApprovalRecord.getStatus());
+            }
+        }
+        return sysAgencyFeeApprovalRecordVo;
+    }
 
 
 }

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

@@ -203,7 +203,7 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
                     .eq(SysRelationPerson::getDelFlag, 1)
                     .eq(SysRelationPerson::getType, 1));
             if (sysRelationPeople.size() > 0) {
-                throw new DescribeException(sysAgencyLeaderDto.getUserName() + "有推荐关系，不允许修改");
+                throw new DescribeException(sysAgencyLeader1.getUserName() + "有推荐关系，不允许修改");
             }
 
             SysAgencyLeader sysAgencyLeader = BeanUtil.copyProperties(sysAgencyLeaderDto, SysAgencyLeader.class);
@@ -752,6 +752,7 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
             LambdaQueryWrapper<SysAgencyLeader> wrapper = new LambdaQueryWrapper<>();
             wrapper.like(StringUtils.isNotEmpty(agencyTeamDto.getDeptName()), SysAgencyLeader::getDeptName, agencyTeamDto.getDeptName());
             wrapper.in(SysAgencyLeader::getUserId, ids);
+            wrapper.eq(SysAgencyLeader::getDelFlag, 1);
 
             Page<SysAgencyLeader> insOrdersPage = page(page, wrapper);
             List<SysAgencyLeader> leaderList = insOrdersPage.getRecords();

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

@@ -364,6 +364,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
             LambdaQueryWrapper<SysPartner> wrapper = new LambdaQueryWrapper<>();
             wrapper.like(StringUtils.isNotEmpty(sysPartnerAPPPageDto.getUserName()), SysPartner::getUserName, sysPartnerAPPPageDto.getUserName());
             wrapper.in(SysPartner::getUserId, ids);
+            wrapper.eq(SysPartner::getDelFlag, 1);
 
             Page<SysPartner> insOrdersPage = page(page, wrapper);
             List<SysPartner> sysPartnerList = insOrdersPage.getRecords();