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

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

@@ -2,7 +2,11 @@ package com.ydtech.modules.admin.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ydtech.modules.admin.model.SysAgencyFeeApproval;
+import com.ydtech.modules.admin.model.dto.SysAgencyFeeApprovalDto;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 
 /**
@@ -16,5 +20,7 @@ public interface SysAgencyFeeApprovalMapper extends BaseMapper<SysAgencyFeeAppro
 
 
     SysAgencyFeeApproval queryById(Integer id);
+
+    List<SysAgencyFeeApproval> seletBySysAgencyFeeApprovalDto(@Param("vo") SysAgencyFeeApprovalDto sysAgencyFeeApprovalDto);
 }
 

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

@@ -14,4 +14,11 @@ public class SysAgencyFeeApprovalDto {
     @ApiModelProperty(value = "结束时间")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private String endTime;
+
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+
+    @ApiModelProperty(value = "提现状态")
+    private String status;
+
 }

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

@@ -8,10 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.dao.*;
 import com.ydtech.modules.admin.model.*;
-import com.ydtech.modules.admin.model.dto.DeptBalanceDto;
-import com.ydtech.modules.admin.model.dto.MySumAmountQueryDto;
-import com.ydtech.modules.admin.model.dto.SysPartnerConsoleDto;
-import com.ydtech.modules.admin.model.dto.SysPartnerInfoConsoleDto;
+import com.ydtech.modules.admin.model.dto.*;
 import com.ydtech.modules.admin.model.po.SysUserAccount;
 import com.ydtech.modules.admin.model.vo.*;
 import com.ydtech.modules.admin.service.*;
@@ -116,9 +113,17 @@ public class DeptBalanceServiceImpl implements DeptBalanceService {
 
 
                         // 填充 已提现抽成费用和可提现抽成费用
-                        List<SysAgencyFeeApproval> sysAgencyFeeApprovals = sysAgencyFeeApprovalMapper.selectList(new LambdaQueryWrapper<SysAgencyFeeApproval>()
-                                .eq(SysAgencyFeeApproval::getUserId, itemLeader.getUserId())
-                                .eq(SysAgencyFeeApproval::getStatus, 1));
+                        SysAgencyFeeApprovalDto sysAgencyFeeApprovalDto = new SysAgencyFeeApprovalDto();
+                        sysAgencyFeeApprovalDto.setBeginTime(deptBalanceVo.getBeginDate());
+                        sysAgencyFeeApprovalDto.setEndTime(deptBalanceVo.getEndDate());
+                        sysAgencyFeeApprovalDto.setUserId(itemLeader.getUserId());
+                        sysAgencyFeeApprovalDto.setStatus("1");
+                        List<SysAgencyFeeApproval> sysAgencyFeeApprovals = sysAgencyFeeApprovalMapper.seletBySysAgencyFeeApprovalDto(sysAgencyFeeApprovalDto);
+
+                        // 填充 已提现抽成费用和可提现抽成费用
+//                        List<SysAgencyFeeApproval> sysAgencyFeeApprovals = sysAgencyFeeApprovalMapper.selectList(new LambdaQueryWrapper<SysAgencyFeeApproval>()
+//                                .eq(SysAgencyFeeApproval::getUserId, itemLeader.getUserId())
+//                                .eq(SysAgencyFeeApproval::getStatus, 1));
                         if (sysAgencyFeeApprovals.size() > 0) {
                             for (SysAgencyFeeApproval sysAgencyFeeApproval : sysAgencyFeeApprovals) {
                                 historyFee = historyFee.add(sysAgencyFeeApproval.getHistoryFee());

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

@@ -25,5 +25,22 @@
         select * from sys_agency_fee_approval where id = #{id} FOR UPDATE;
     </select>
 
+    <select id="seletBySysAgencyFeeApprovalDto" resultType="com.ydtech.modules.admin.model.SysAgencyFeeApproval">
+        select * from sys_agency_fee_approval a
+        <where>
+            <if test="vo.userId != null and vo.userId != ''">
+                and a.user_id = #{vo.userId}
+            </if>
+            <if test="vo.status !=null and  vo.status !=''">
+                and a.status = #{vo.status}
+            </if>
+            <if test="vo.beginTime !=null and vo.beginTime !=''  and vo.endTime !=null and  vo.endTime !=''">
+                AND DATE_FORMAT( a.create_time, '%Y-%m-%d') BETWEEN DATE_FORMAT( #{vo.beginTime}, '%Y-%m-%d') AND
+                DATE_FORMAT( #{vo.endTime}, '%Y-%m-%d')
+            </if>
+        </where>
+
+    </select>
+
 </mapper>