Merge branch 'test' into test-dx

src/main/java/com/ydtech/modules/console/controller/WithdrawalTaskController.java

@@ -0,0 +1,39 @@
+package com.ydtech.modules.console.controller;
+
+
+import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.console.dto.WithdrawalTaskDto;
+import com.ydtech.modules.console.service.WithdrawalTaskService;
+import com.ydtech.modules.console.vo.WithdrawalTaskVo;
+import com.ydtech.modules.order.entity.BasePageResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *   控制台体现任务
+ */
+@RestController
+@RequestMapping("/withdrawalTask")
+public class WithdrawalTaskController {
+    @Autowired
+    private WithdrawalTaskService withdrawalTaskService;
+
+    /**
+     *
+     * @param withdrawalTaskVo
+     * @return  控制台 提现任务  分页
+     */
+    @PostMapping("/queryPage")
+    @ApiOperation(value = "银行卡号分页")
+    public HttpResult<BasePageResult<WithdrawalTaskDto>> queryPageOrder(@RequestBody @Valid WithdrawalTaskVo withdrawalTaskVo) {
+        BasePageResult<WithdrawalTaskDto> result = withdrawalTaskService.queryByVo(withdrawalTaskVo);
+        return HttpResult.ok("success", result);
+    }
+
+}

src/main/java/com/ydtech/modules/console/dao/WithdrawalTaskMapper.java

@@ -0,0 +1,15 @@
+package com.ydtech.modules.console.dao;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ydtech.modules.console.dto.WithdrawalTaskDto;
+import com.ydtech.modules.console.vo.WithdrawalTaskVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface WithdrawalTaskMapper {
+
+
+    Page<WithdrawalTaskDto> queryByVo(@Param("page") Page<WithdrawalTaskDto> page,@Param("vo") WithdrawalTaskVo withdrawalTaskVo);
+
+}

src/main/java/com/ydtech/modules/console/dto/WithdrawalTaskDto.java

@@ -0,0 +1,57 @@
+package com.ydtech.modules.console.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class WithdrawalTaskDto implements Serializable {
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+
+    @ApiModelProperty(value = "用户名称")
+    private String userName;
+
+
+    @ApiModelProperty(value = "银行卡号")
+    private String bankNumber;
+
+    @ApiModelProperty(value = "开户行")
+    private String bankAccount;
+
+    @ApiModelProperty(value = "开户行地址")
+    private String bankAddress;
+
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+
+    @ApiModelProperty(value = "账户审核状态  0未审核 1通过 2驳回")
+    private Integer auditStatus;
+
+
+    @ApiModelProperty(value = "审核时间")
+    private String auditTime;
+
+    @ApiModelProperty(value = "审核人id")
+    private String auditUserId;
+
+    @ApiModelProperty(value = "审核人名称")
+    private String auditUserName;
+
+
+    @ApiModelProperty(value = "驳回原因")
+    private String remark;
+
+    @ApiModelProperty(value = "删除标志 0未删除 1删除")
+    private String delFlag;
+
+    @ApiModelProperty(value = "真实姓名")
+    private String realUserName;
+
+    @ApiModelProperty(value = "0 未验证 1 已验证")
+    private String bankVerify;
+
+    @ApiModelProperty(value = "归属端 1：渠道 2：个代 a:合伙人 b:机构负责人")
+    private String ascription;
+}

src/main/java/com/ydtech/modules/console/service/WithdrawalTaskService.java

@@ -0,0 +1,11 @@
+package com.ydtech.modules.console.service;
+
+
+import com.ydtech.modules.console.dto.WithdrawalTaskDto;
+import com.ydtech.modules.console.vo.WithdrawalTaskVo;
+import com.ydtech.modules.order.entity.BasePageResult;
+
+public interface WithdrawalTaskService {
+    BasePageResult<WithdrawalTaskDto> queryByVo(WithdrawalTaskVo withdrawalTaskVo);
+
+}

src/main/java/com/ydtech/modules/console/service/impl/WithdrawalTaskServiceImpl.java

@@ -0,0 +1,59 @@
+package com.ydtech.modules.console.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ydtech.modules.admin.utils.SliceUpDateUtil;
+import com.ydtech.modules.console.dao.WithdrawalTaskMapper;
+import com.ydtech.modules.console.dto.WithdrawalTaskDto;
+import com.ydtech.modules.console.service.WithdrawalTaskService;
+import com.ydtech.modules.console.vo.WithdrawalTaskVo;
+import com.ydtech.modules.order.entity.BasePageResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.HashMap;
+
+@Service
+public class WithdrawalTaskServiceImpl implements WithdrawalTaskService {
+    @Autowired
+    private WithdrawalTaskMapper withdrawalTaskMapper;
+
+    @Override
+    public BasePageResult<WithdrawalTaskDto> queryByVo(WithdrawalTaskVo withdrawalTaskVo) {
+        HashMap<String, String> dateMapByType = getDateMapByType(withdrawalTaskVo.getDateType(), withdrawalTaskVo.getBeginDate(), withdrawalTaskVo.getEndDate());
+        withdrawalTaskVo.setBeginDate(dateMapByType.get("startDate"));
+        withdrawalTaskVo.setEndDate(dateMapByType.get("endDate"));
+        Page<WithdrawalTaskDto> page = new Page<>(withdrawalTaskVo.getPageNum(), withdrawalTaskVo.getPageSize());
+        Page<WithdrawalTaskDto> result = withdrawalTaskMapper.queryByVo(page, withdrawalTaskVo);
+        return new BasePageResult<>(withdrawalTaskVo.getPageNum(), page.getSize(), result.getTotal(), page.getPages(),
+                result.getRecords());
+    }
+
+
+    private static HashMap<String, String> getDateMapByType(String type, String startDate, String endDate) {
+        HashMap<String, String> map = new HashMap<>();
+        String startDateStr = "";
+        String endDateStr = "";
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(startDate) && org.apache.commons.lang3.StringUtils.isNotBlank(endDate)) {
+            startDateStr = org.apache.commons.lang3.StringUtils.isNotBlank(startDate) ? startDate + " 00:00:00" : null;
+            endDateStr = org.apache.commons.lang3.StringUtils.isNotBlank(endDate) ? endDate + " 23:59:59" : null;
+        } else {
+            if ("1".equals(type)) {
+                // 近1天
+                startDateStr = SliceUpDateUtil.getBeforeDay(new Date(), 0) + " 00:00:00";
+                endDateStr = SliceUpDateUtil.getBeforeDay(new Date(), 0) + " 23:59:59";
+            } else if ("2".equals(type)) {
+                // 近7天
+                startDateStr = SliceUpDateUtil.getBeforeDay(new Date(), 1) + " 00:00:00";
+                endDateStr = SliceUpDateUtil.getBeforeDay(new Date(), 0) + " 23:59:59";
+            } else if ("3".equals(type)) {
+                // 近30天
+                startDateStr = SliceUpDateUtil.getBeforeDay(new Date(), 6) + " 00:00:00";
+                endDateStr = SliceUpDateUtil.getBeforeDay(new Date(), 0) + " 23:59:59";
+            }
+        }
+        map.put("startDate", startDateStr);
+        map.put("endDate", endDateStr);
+        return map;
+    }
+}

src/main/java/com/ydtech/modules/console/vo/WithdrawalTaskVo.java

@@ -0,0 +1,32 @@
+package com.ydtech.modules.console.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+@Data
+@ApiModel("查询Vo")
+public class WithdrawalTaskVo {
+
+    @ApiModelProperty(value = "每页页数")
+    private int pageSize;
+
+    @ApiModelProperty(value = "页数")
+    @Min(value = 1, message = "页数最小为1")
+    private int pageNum;
+
+    @ApiModelProperty(value = "天数")
+    private String dateType;
+
+
+    @ApiModelProperty(value = "时间筛选开始")
+    private String beginDate;
+
+    @ApiModelProperty(value = "时间筛选结束")
+    private String endDate;
+
+
+
+
+}

src/main/resources/mapper/modules/console/WithdrawalTaskMapper.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ydtech.modules.console.dao.WithdrawalTaskMapper">
+
+    <select id="queryByVo" resultType="com.ydtech.modules.console.dto.WithdrawalTaskDto">
+        SELECT
+            id,
+            bank_number,
+            bank_account,
+            bank_address,
+            user_id,
+            user_name,
+            is_default,
+            create_time,
+            remark,
+            audit_status,
+            audit_time,
+            audit_user_id,
+            audit_user_name,
+            del_flag,
+            real_user_name,
+            bank_verify,
+            ascription
+        FROM
+            sys_user_bank_card
+        <where>
+            audit_status = '1'
+            <if test="vo.beginDate  != null  and  vo.beginDate!=''  and vo.endDate  != null  and  vo.endDate!=''">
+                AND audit_time BETWEEN #{vo.beginDate} AND #{vo.endDate}
+            </if>
+        </where>
+            
+        ORDER BY
+            audit_time ASC
+    </select>
+
+
+</mapper>