提现分页列表 和 提现详情

database/mcb/update.sql

 alter table t_finance_customer_assets add remark text  COMMENT '备注';
 alter table t_platform_log add caller_type char(2) NOT NULL COMMENT '调用类型：01商城用户，02平台用户';
-alter table t_finance_trade_flow add assets_id Bigint(20) default NULL COMMENT'企业资产id';
\ No newline at end of file
+alter table t_finance_trade_flow add assets_id Bigint(20) default NULL COMMENT'企业资产id';
+alter table t_finance_customer_balance add balance_time datetime default NULL COMMENT'充值时间';
\ No newline at end of file

jz-dm-manage/src/main/java/com/jz/manage/moduls/controller/finance/FinanceCustomerBalanceController.java

 package com.jz.manage.moduls.controller.finance;
 
+import com.jz.common.bean.PageInfoResponse;
+import com.jz.common.constant.Constants;
+import com.jz.common.utils.Result;
 import com.jz.manage.moduls.controller.BaseController;
+import com.jz.manage.moduls.controller.finance.platForm.BalanceInfoDto;
+import com.jz.manage.moduls.controller.finance.platForm.BalanceListDto;
+import com.jz.manage.moduls.controller.finance.platForm.BalanceListRequest;
 import com.jz.manage.moduls.service.FinanceCustomerBalanceService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 企业客户充值记录(TFinanceCustomerBalance)表控制层
@@ -14,12 +26,57 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("financeCustomerBalance")
+@Api(tags = "平台--利润中心")
 public class FinanceCustomerBalanceController extends BaseController {
     /**
      * 服务对象
      */
     @Autowired
-    private FinanceCustomerBalanceService tFinanceCustomerBalanceService;
+    private FinanceCustomerBalanceService financeCustomerBalanceService;
 
+    /**
+     * 充值管理--分页列表
+     *
+     * @return
+     * @author Bellamy
+     * @since 2020-12-03
+     */
+    @PostMapping(value = "/cashOutList")
+    @ApiOperation(value = "充值管理--分页列表", notes = "分页列表")
+    public PageInfoResponse<BalanceListDto> getFinanceCashOutList(@RequestBody BalanceListRequest balanceListRequest, HttpServletRequest httpRequest) throws Exception {
+        PageInfoResponse<BalanceListDto> pageInfo = new PageInfoResponse<BalanceListDto>();
+        Map map = new HashMap();
+        //从session中获取平台用户id
+        //SysUserDto user = (SysUserDto) SessionUtils.getUserCurrent(requset,"sysUser");
+        //map.put("userId", user.getUserId());
+        try {
+            pageInfo = financeCustomerBalanceService.findListBalance(balanceListRequest, httpRequest);
+        } catch (Exception e) {
+            pageInfo.setMessage("查询失败");
+            pageInfo.setCode(Constants.FAILURE_CODE);
+            e.printStackTrace();
+        }
+        return pageInfo;
+    }
 
+    /**
+     * 充值管理--充值详情
+     *
+     * @return
+     * @author Bellamy
+     * @since 2020-12-06
+     */
+    @PostMapping(value = "/balanceInfoById")
+    @ApiOperation(value = "充值管理--充值详情", notes = "充值详情")
+    public Result<BalanceInfoDto> getFinanceBalanceInfoById(@RequestParam(value = "customerBalanceId") String customerBalanceId, HttpServletRequest httpRequest) throws Exception {
+        Result<BalanceInfoDto> result = new Result<>();
+        if (StringUtils.isEmpty(customerBalanceId)) {
+            result.setMsg("参数为空！");
+            result.setSuccess(false);
+            return result;
+        }
+        BalanceInfoDto dto = financeCustomerBalanceService.queryBalanceByid(customerBalanceId);
+        result.setData(dto);
+        return result;
+    }
 }
\ No newline at end of file

jz-dm-manage/src/main/java/com/jz/manage/moduls/controller/finance/platForm/BalanceInfoDto.java

+package com.jz.manage.moduls.controller.finance.platForm;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+/**
+ * 平台利润中心--充值详情返回参数对象
+ *
+ * @author Bellamy
+ * @since 2020-12-05 10:41:43
+ */
+@ApiModel(value = "充值管理--充值详情返回参数对象", description = "充值详情返回参数对象")
+public class BalanceInfoDto {
+
+    /**
+     * 企业名
+     */
+    @ApiModelProperty(value = "企业名")
+    private String departmentName;
+    /**
+     * 充值描述
+     */
+    @ApiModelProperty(value = "充值描述")
+    private String remark;
+
+    /**
+     * 充值金额
+     */
+    @ApiModelProperty(value = "充值金额")
+    private BigDecimal balanceMoney;
+
+    /**
+     * 审核意见
+     */
+    @ApiModelProperty(value = "审核意见")
+    private String rejectReason;
+
+    /**
+     * 充值状态：01待审核，02审核通过，03未通过
+     */
+    @ApiModelProperty(value = "充值状态")
+    private String auditStatus;
+    /**
+     * 充值id
+     */
+    @ApiModelProperty(value = "充值id")
+    private Long customerBalanceId;
+
+
+    public String getDepartmentName() {
+        return departmentName;
+    }
+
+    public void setDepartmentName(String departmentName) {
+        this.departmentName = departmentName;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+
+    public String getRejectReason() {
+        return rejectReason;
+    }
+
+    public void setRejectReason(String rejectReason) {
+        this.rejectReason = rejectReason;
+    }
+
+    public BigDecimal getBalanceMoney() {
+        return balanceMoney;
+    }
+
+    public void setBalanceMoney(BigDecimal balanceMoney) {
+        this.balanceMoney = balanceMoney;
+    }
+
+    public Long getCustomerBalanceId() {
+        return customerBalanceId;
+    }
+
+    public void setCustomerBalanceId(Long customerBalanceId) {
+        this.customerBalanceId = customerBalanceId;
+    }
+}
\ No newline at end of file

jz-dm-manage/src/main/java/com/jz/manage/moduls/controller/finance/platForm/BalanceListDto.java

+package com.jz.manage.moduls.controller.finance.platForm;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 平台利润中心--充值管理--分页列表返回参数对象
+ *
+ * @author Bellamy
+ * @since 2020-12-05 10:41:43
+ */
+@ApiModel(value = "充值管理--分页列表返回参数对象", description = "分页列表返回参数对象")
+public class BalanceListDto {
+
+    /**
+     * 企业名
+     */
+    @ApiModelProperty(value = "企业名")
+    private String departmentName;
+    /**
+     * 充值描述
+     */
+    @ApiModelProperty(value = "充值描述")
+    private String remark;
+
+    /**
+     * 充值金额
+     */
+    @ApiModelProperty(value = "充值金额")
+    private BigDecimal balanceMoney;
+
+    /**
+     * 充值时间
+     */
+    @ApiModelProperty(value = "充值时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date balanceTime;
+
+    /**
+     * 充值状态：01待审核，02审核通过，03未通过
+     */
+    @ApiModelProperty(value = "充值状态")
+    private String auditStatus;
+    /**
+     * 提现id
+     */
+    @ApiModelProperty(value = "提现id")
+    private Long customerBalanceId;
+
+
+    public String getDepartmentName() {
+        return departmentName;
+    }
+
+    public void setDepartmentName(String departmentName) {
+        this.departmentName = departmentName;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+
+    public BigDecimal getBalanceMoney() {
+        return balanceMoney;
+    }
+
+    public void setBalanceMoney(BigDecimal balanceMoney) {
+        this.balanceMoney = balanceMoney;
+    }
+
+    public Date getBalanceTime() {
+        return balanceTime;
+    }
+
+    public void setBalanceTime(Date balanceTime) {
+        this.balanceTime = balanceTime;
+    }
+
+    public Long getCustomerBalanceId() {
+        return customerBalanceId;
+    }
+
+    public void setCustomerBalanceId(Long customerBalanceId) {
+        this.customerBalanceId = customerBalanceId;
+    }
+}
\ No newline at end of file

jz-dm-manage/src/main/java/com/jz/manage/moduls/controller/finance/platForm/BalanceListRequest.java

+package com.jz.manage.moduls.controller.finance.platForm;
+
+import com.jz.common.bean.BasePageBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 平台利润中心--充值管理--分页列表参数对象
+ *
+ * @author Bellamy
+ * @since 2020-12-05 10:41:43
+ */
+@ApiModel(value = "充值管理--分页列表参数对象", description = "分页列表参数对象")
+public class BalanceListRequest extends BasePageBean {
+
+    /**
+     * 企业名
+     */
+    @ApiModelProperty(value = "企业名")
+    private String departmentName;
+    /**
+     * 充值描述
+     */
+    @ApiModelProperty(value = "充值描述")
+    private String remark;
+
+    /**
+     * 充值状态：01待审核，02审核通过，03未通过
+     */
+    @ApiModelProperty(value = "充值状态")
+    private String auditStatus;
+
+    /**
+     * 充值时间
+     */
+    @ApiModelProperty(value = "充值时间")
+    private String balanceTime;
+
+    public String getDepartmentName() {
+        return departmentName;
+    }
+
+    public void setDepartmentName(String departmentName) {
+        this.departmentName = departmentName;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+
+    public String getBalanceTime() {
+        return balanceTime;
+    }
+
+    public void setBalanceTime(String balanceTime) {
+        this.balanceTime = balanceTime;
+    }
+}
\ No newline at end of file

jz-dm-manage/src/main/java/com/jz/manage/moduls/controller/finance/platForm/CashOutAuditRequest.java

+package com.jz.manage.moduls.controller.finance.platForm;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 平台利润中心--提现管理--提现参数对象
+ *
+ * @author Bellamy
+ * @since 2020-12-05 10:41:43
+ */
+@ApiModel(value = "提现管理--提现参数对象", description = "提现参数对象")
+public class CashOutAuditRequest {
+
+    /**
+     * 审核意见
+     */
+    @ApiModelProperty(value = "审核意见")
+    private String rejectReason;
+    /**
+     * 提现id
+     */
+    @ApiModelProperty(value = "提现id")
+    private String cashOutId;
+
+    /**
+     * 审核状态：01待审核，02审核通过，03未通过
+     */
+    @ApiModelProperty(value = "审核状态")
+    private String auditStatus;
+
+    public String getRejectReason() {
+        return rejectReason;
+    }
+
+    public void setRejectReason(String rejectReason) {
+        this.rejectReason = rejectReason;
+    }
+
+    public String getCashOutId() {
+        return cashOutId;
+    }
+
+    public void setCashOutId(String cashOutId) {
+        this.cashOutId = cashOutId;
+    }
+
+    public String getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+}
\ No newline at end of file

jz-dm-manage/src/main/java/com/jz/manage/moduls/controller/finance/platForm/CashOutListDto.java

 package com.jz.manage.moduls.controller.finance.platForm;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -36,6 +37,7 @@ public class CashOutListDto {
      * 提现时间
      */
     @ApiModelProperty(value = "提现时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date casOutTime;
 
     /**

jz-dm-manage/src/main/java/com/jz/manage/moduls/mapper/FinanceCustomerBalanceDao.java

@@ -2,6 +2,12 @@ package com.jz.manage.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
 import com.jz.common.entity.FinanceCustomerBalance;
+import com.jz.manage.moduls.controller.finance.platForm.BalanceInfoDto;
+import com.jz.manage.moduls.controller.finance.platForm.BalanceListDto;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 企业客户充值记录(TFinanceCustomerBalance)表数据库访问层
@@ -12,4 +18,7 @@ import com.jz.common.entity.FinanceCustomerBalance;
 public interface FinanceCustomerBalanceDao extends BaseMapper<FinanceCustomerBalance> {
 
 
+    List<BalanceListDto> findListBalance(Map param) throws Exception;
+
+    BalanceInfoDto queryBalanceByid(@Param("customerBalanceId") String customerBalanceId) throws Exception;
 }
\ No newline at end of file

jz-dm-manage/src/main/java/com/jz/manage/moduls/service/FinanceCustomerBalanceService.java

 package com.jz.manage.moduls.service;
 
+import com.jz.common.bean.PageInfoResponse;
+import com.jz.manage.moduls.controller.finance.platForm.BalanceInfoDto;
+import com.jz.manage.moduls.controller.finance.platForm.BalanceListDto;
+import com.jz.manage.moduls.controller.finance.platForm.BalanceListRequest;
+
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * 企业客户充值记录(TFinanceCustomerBalance)表服务接口
  *
@@ -9,4 +16,7 @@ package com.jz.manage.moduls.service;
 public interface FinanceCustomerBalanceService {
 
 
+    PageInfoResponse<BalanceListDto> findListBalance(BalanceListRequest balanceListRequest, HttpServletRequest httpRequest) throws Exception;
+
+    BalanceInfoDto queryBalanceByid(String customerBalanceId) throws Exception;
 }
\ No newline at end of file

jz-dm-manage/src/main/java/com/jz/manage/moduls/service/impl/FinanceCustomerBalanceServiceImpl.java

 package com.jz.manage.moduls.service.impl;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.jz.common.bean.PageInfoResponse;
+import com.jz.common.constant.Constants;
+import com.jz.manage.moduls.controller.finance.platForm.BalanceInfoDto;
+import com.jz.manage.moduls.controller.finance.platForm.BalanceListDto;
+import com.jz.manage.moduls.controller.finance.platForm.BalanceListRequest;
 import com.jz.manage.moduls.mapper.FinanceCustomerBalanceDao;
 import com.jz.manage.moduls.service.FinanceCustomerBalanceService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 企业客户充值记录(TFinanceCustomerBalance)表服务实现类
  *
@@ -13,8 +26,50 @@ import org.springframework.stereotype.Service;
  */
 @Service("financeCustomerBalanceService")
 public class FinanceCustomerBalanceServiceImpl implements FinanceCustomerBalanceService {
+
     @Autowired
-    private FinanceCustomerBalanceDao tFinanceCustomerBalanceDao;
+    private FinanceCustomerBalanceDao financeCustomerBalanceDao;
+
+
+    @Override
+    public PageInfoResponse<BalanceListDto> findListBalance(BalanceListRequest balanceListRequest, HttpServletRequest httpRequest)  throws Exception {
+        PageInfoResponse<BalanceListDto> pageInfoResponse = new PageInfoResponse<>();
+
+        Map param = new HashMap();
+        //从session中获取平台用户id
+        //SysUserDto user = (SysUserDto) SessionUtils.getUserCurrent(requset,"sysUser");
+        //param.put("userId", user.getUserId());
+        //充值描述
+        if (StringUtils.isNotEmpty(balanceListRequest.getRemark())) {
+            param.put("remark", balanceListRequest.getRemark());
+        }
+        //企业名
+        if (StringUtils.isNotEmpty(balanceListRequest.getDepartmentName())) {
+            param.put("departmentName", balanceListRequest.getDepartmentName());
+        }
+        //充值状态
+        if (StringUtils.isNotEmpty(balanceListRequest.getAuditStatus())) {
+            param.put("auditStatus", balanceListRequest.getAuditStatus());
+        }
+        //充值时间
+        if (StringUtils.isNotEmpty(balanceListRequest.getBalanceTime())) {
+            String balanceTime = balanceListRequest.getBalanceTime();
+            String[] times = balanceTime.split("-");
+            param.put("startTime", times[0] + "00:00:00");
+            param.put("endTime", times[1] + "23:59:59");
+        }
+        PageHelper.startPage(balanceListRequest.getPageNum(), balanceListRequest.getPageSize());
+        List<BalanceListDto> list = financeCustomerBalanceDao.findListBalance(param);
+        PageInfo<BalanceListDto> pageInfo = new PageInfo<>(list);
 
+        pageInfoResponse.setCode(Constants.SUCCESS_CODE);
+        pageInfoResponse.setMessage("查询成功");
+        pageInfoResponse.setData(pageInfo);
+        return pageInfoResponse;
+    }
 
+    @Override
+    public BalanceInfoDto queryBalanceByid(String customerBalanceId) throws Exception {
+        return financeCustomerBalanceDao.queryBalanceByid(customerBalanceId);
+    }
 }
\ No newline at end of file

jz-dm-manage/src/main/resources/mapper/finance/FinanceCustomerBalanceDao.xml

@@ -120,4 +120,40 @@
         delete from t_finance_customer_balance where customer_balance_id = #{customerBalanceId}
     </delete>
 
+    <!--充值管理列表-->
+    <select id="findListBalance" resultType="com.jz.manage.moduls.controller.finance.platForm.BalanceListDto" parameterType="map">
+        select
+            t2.customer_balance_id as customerBalanceId,
+            t2.balance_money as balanceMoney,
+            t2.balance_time as balanceTime,
+            (case when t2.audit_status='01' then '待审核' when t2.audit_status='02' then '已审核'
+            when t2.audit_status='03' then '未通过' end) as auditStatus,
+            t2.remark,
+            t3.department_name as departmentName
+        from t_finance_customer_assets t1
+        inner join t_department t3 on t3.department_id=t1.department_id
+        inner join  t_finance_customer_balance t2 on t2.assets_id=t1.assets_id and t2.del_flag='N'
+        where 1=1 and t1.del_flag='N'
+        <if test="departmentName != null">and t3.department_name like concat('%',#{departmentName},'%')</if>
+        <if test="remark != null">and t2.remark like concat('%',#{remark},'%')</if>
+        <if test="auditStatus != null">and t2.audit_status = #{auditStatus}</if>
+        <if test="startTime != null">and t2.balance_time >= #{startTime}</if>
+        <if test="endTime != null">and #{endTime} >= t2.balance_time</if>
+    </select>
+
+    <select id="queryBalanceByid" resultType="com.jz.manage.moduls.controller.finance.platForm.BalanceInfoDto" parameterType="map">
+        select
+            t2.customer_balance_id as customerBalanceId,
+            t2.balance_money as balanceMoney,
+            (case when t2.audit_status='01' then '待审核' when t2.audit_status='02' then '已审核'
+            when t2.audit_status='03' then '未通过' end) as auditStatus,
+            t2.reject_reason as rejectReason,
+            t2.remark,
+            t3.department_name as departmentName
+		from t_finance_customer_assets t1
+		inner join t_department t3 on t3.department_id=t1.department_id and t3.del_flag='N'
+		inner join  t_finance_customer_balance t2 on t2.assets_id=t1.assets_id and t2.del_flag='N'
+		where 1=1 and t1.del_flag='N' and t2.customer_balance_id = #{customerBalanceId}
+    </select>
+
 </mapper>
\ No newline at end of file

jz-dm-manage/src/main/resources/mapper/finance/PlatformTradeFlowInfoDao.xml

@@ -193,7 +193,7 @@
             t3.department_name as departmentName
 		from t_finance_customer_assets t1
 		inner join t_department t3 on t3.department_id=t1.department_id
-		left join  t_finance_cash_out t2 on t2.assets_id=t1.assets_id and t2.del_flag='N'
+        inner join  t_finance_cash_out t2 on t2.assets_id=t1.assets_id and t2.del_flag='N'
 		where 1=1 and t1.del_flag='N'
         <if test="departmentName != null">and t3.department_name like concat('%',#{departmentName},'%')</if>
         <if test="remark != null">and t2.remark like concat('%',#{remark},'%')</if>