提现管理接口

gic-platform-finance-service/src/main/java/com/gic/finance/dao/mapper/TabCashWithdrawalMapper.java

+package com.gic.finance.dao.mapper;
+
+import com.gic.finance.entity.TabCashWithdrawal;
+import com.gic.finance.qo.CashWithdrawalQueryListQO;
+
+import java.util.List;
+
+public interface TabCashWithdrawalMapper {
+    /**
+     * 根据主键删除
+     *
+     * @param cashWithdrawalId 主键
+     * @return 更新条目数
+     */
+    int deleteByPrimaryKey(Integer cashWithdrawalId);
+
+    /**
+     * 插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insert(TabCashWithdrawal record);
+
+    /**
+     * 动态插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insertSelective(TabCashWithdrawal record);
+
+    /**
+     * 根据主键查询
+     *
+     * @param cashWithdrawalId 主键
+     * @return 实体对象
+     */
+    TabCashWithdrawal selectByPrimaryKey(Integer cashWithdrawalId);
+
+    /**
+     * 根据主键动态更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKeySelective(TabCashWithdrawal record);
+
+    /**
+     * 根据主键更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKey(TabCashWithdrawal record);
+
+    /**
+     * 查询列表
+     * @Title: listCashWithdrawal

+     * @Description:
+    
 * @author guojuxing
+     * @param params

+     * @return  java.util.List<com.gic.finance.entity.TabCashWithdrawal>

+    
 */
+    List<TabCashWithdrawal> listCashWithdrawal(CashWithdrawalQueryListQO params);
+}
\ No newline at end of file

gic-platform-finance-service/src/main/java/com/gic/finance/entity/TabCashWithdrawal.java

+package com.gic.finance.entity;
+
+import java.util.Date;
+
+/**
+ * tab_cash_withdrawal
+ */
+public class TabCashWithdrawal {
+    /**
+     * 
+     */
+    private Integer cashWithdrawalId;
+
+    /**
+     * 申请单流水号
+     */
+    private String cashWithdrawalSerialNumber;
+
+    /**
+     * 申请方类型 1:服务商 2:供应商
+     */
+    private Integer applyType;
+
+    /**
+     * 提现金额
+     */
+    private Double cashWithdrawalAmount;
+
+    /**
+     * 提现状态 1:待审核 2:审核通过 3:已完成 4:已取消 5:已驳回
+     */
+    private Integer cashWithdrawalStatus;
+
+    /**
+     * 驳回理由
+     */
+    private String rejectReason;
+
+    /**
+     * 操作人
+     */
+    private String operatorId;
+
+    /**
+     * 操作人姓名
+     */
+    private String operatorName;
+
+    /**
+     * 操作时间
+     */
+    private Date operatorTime;
+
+    /**
+     * 操作人手机号码
+     */
+    private String operatorPhone;
+
+    /**
+     * 操作人手机号国际区号
+     */
+    private String operatorPhoneAreaCode;
+
+    /**
+     * 
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 银行转账流水号
+     */
+    private String bankSerialNumber;
+
+    /**
+     * 收款开户名称
+     */
+    private String receiptName;
+
+    /**
+     * 收款支行名称
+     */
+    private String receiptBranchName;
+
+    /**
+     * 收款开户行
+     */
+    private String receiptBank;
+
+    /**
+     * 收款银行账号
+     */
+    private String receiptBankAccount;
+
+    /**
+     * 打款方信息ID
+     */
+    private Integer payId;
+
+    /**
+     * 打款户开户名称
+     */
+    private String payAccountName;
+
+    /**
+     * 打款户支行名称
+     */
+    private String payAccountBranchName;
+
+    /**
+     * 打款户开户行
+     */
+    private String payAccountBank;
+
+    /**
+     * 打款户银行账号
+     */
+    private String payAccount;
+
+    /**
+     * 物流公司
+     */
+    private String expressMailName;
+
+    /**
+     * 发票物流号
+     */
+    private String expressMailNumber;
+
+    /**
+     * 
+     */
+    private Date createTime;
+
+    /**
+     * 
+     */
+    private Date updateTime;
+
+    public Integer getCashWithdrawalId() {
+        return cashWithdrawalId;
+    }
+
+    public void setCashWithdrawalId(Integer cashWithdrawalId) {
+        this.cashWithdrawalId = cashWithdrawalId;
+    }
+
+    public String getCashWithdrawalSerialNumber() {
+        return cashWithdrawalSerialNumber;
+    }
+
+    public void setCashWithdrawalSerialNumber(String cashWithdrawalSerialNumber) {
+        this.cashWithdrawalSerialNumber = cashWithdrawalSerialNumber;
+    }
+
+    public Integer getApplyType() {
+        return applyType;
+    }
+
+    public void setApplyType(Integer applyType) {
+        this.applyType = applyType;
+    }
+
+    public Double getCashWithdrawalAmount() {
+        return cashWithdrawalAmount;
+    }
+
+    public void setCashWithdrawalAmount(Double cashWithdrawalAmount) {
+        this.cashWithdrawalAmount = cashWithdrawalAmount;
+    }
+
+    public Integer getCashWithdrawalStatus() {
+        return cashWithdrawalStatus;
+    }
+
+    public void setCashWithdrawalStatus(Integer cashWithdrawalStatus) {
+        this.cashWithdrawalStatus = cashWithdrawalStatus;
+    }
+
+    public String getRejectReason() {
+        return rejectReason;
+    }
+
+    public void setRejectReason(String rejectReason) {
+        this.rejectReason = rejectReason;
+    }
+
+    public String getOperatorId() {
+        return operatorId;
+    }
+
+    public void setOperatorId(String operatorId) {
+        this.operatorId = operatorId;
+    }
+
+    public String getOperatorName() {
+        return operatorName;
+    }
+
+    public void setOperatorName(String operatorName) {
+        this.operatorName = operatorName;
+    }
+
+    public Date getOperatorTime() {
+        return operatorTime;
+    }
+
+    public void setOperatorTime(Date operatorTime) {
+        this.operatorTime = operatorTime;
+    }
+
+    public String getOperatorPhone() {
+        return operatorPhone;
+    }
+
+    public void setOperatorPhone(String operatorPhone) {
+        this.operatorPhone = operatorPhone;
+    }
+
+    public String getOperatorPhoneAreaCode() {
+        return operatorPhoneAreaCode;
+    }
+
+    public void setOperatorPhoneAreaCode(String operatorPhoneAreaCode) {
+        this.operatorPhoneAreaCode = operatorPhoneAreaCode;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getBankSerialNumber() {
+        return bankSerialNumber;
+    }
+
+    public void setBankSerialNumber(String bankSerialNumber) {
+        this.bankSerialNumber = bankSerialNumber;
+    }
+
+    public String getReceiptName() {
+        return receiptName;
+    }
+
+    public void setReceiptName(String receiptName) {
+        this.receiptName = receiptName;
+    }
+
+    public String getReceiptBranchName() {
+        return receiptBranchName;
+    }
+
+    public void setReceiptBranchName(String receiptBranchName) {
+        this.receiptBranchName = receiptBranchName;
+    }
+
+    public String getReceiptBank() {
+        return receiptBank;
+    }
+
+    public void setReceiptBank(String receiptBank) {
+        this.receiptBank = receiptBank;
+    }
+
+    public String getReceiptBankAccount() {
+        return receiptBankAccount;
+    }
+
+    public void setReceiptBankAccount(String receiptBankAccount) {
+        this.receiptBankAccount = receiptBankAccount;
+    }
+
+    public Integer getPayId() {
+        return payId;
+    }
+
+    public void setPayId(Integer payId) {
+        this.payId = payId;
+    }
+
+    public String getExpressMailName() {
+        return expressMailName;
+    }
+
+    public void setExpressMailName(String expressMailName) {
+        this.expressMailName = expressMailName;
+    }
+
+    public String getExpressMailNumber() {
+        return expressMailNumber;
+    }
+
+    public void setExpressMailNumber(String expressMailNumber) {
+        this.expressMailNumber = expressMailNumber;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getPayAccountName() {
+        return payAccountName;
+    }
+
+    public void setPayAccountName(String payAccountName) {
+        this.payAccountName = payAccountName;
+    }
+
+    public String getPayAccountBranchName() {
+        return payAccountBranchName;
+    }
+
+    public void setPayAccountBranchName(String payAccountBranchName) {
+        this.payAccountBranchName = payAccountBranchName;
+    }
+
+    public String getPayAccountBank() {
+        return payAccountBank;
+    }
+
+    public void setPayAccountBank(String payAccountBank) {
+        this.payAccountBank = payAccountBank;
+    }
+
+    public String getPayAccount() {
+        return payAccount;
+    }
+
+    public void setPayAccount(String payAccount) {
+        this.payAccount = payAccount;
+    }
+}
\ No newline at end of file

gic-platform-finance-service/src/main/java/com/gic/finance/service/CashWithdrawalService.java

+package com.gic.finance.service;
+
+import com.gic.finance.dto.CashWithdrawalDTO;
+import com.gic.finance.entity.TabCashWithdrawal;
+import com.gic.finance.qo.CashWithdrawalQueryListQO;
+import com.github.pagehelper.Page;
+
+/**
+ * 提现管理
+ * @ClassName: CashWithdrawalService

+ * @Description: 

+ * @author guojuxing

+ * @date 2019/8/30 9:15 AM

+ */
+public interface CashWithdrawalService {
+
+    /**
+     * 新增
+     * @Title: save

+     * @Description:
+    
 * @author guojuxing
+     * @param dto

+     * @return  void

+    
 */
+    void save(CashWithdrawalDTO dto);
+
+    /**
+     * 更新
+     * @Title: updateStatus

+     * @Description:
+    
 * @author guojuxing
+     * @param record

+     * @return  void

+    
 */
+    void update(TabCashWithdrawal record);
+
+    /**
+     * 分页查询
+     * @Title: pageCashWithdrawal

+     * @Description:
+    
 * @author guojuxing
+     * @param params

+     * @return  com.github.pagehelper.Page<com.gic.finance.dto.CashWithdrawalDTO>

+    
 */
+    Page<TabCashWithdrawal> pageCashWithdrawal(CashWithdrawalQueryListQO params);
+
+
+    TabCashWithdrawal getById(Integer id);
+}

gic-platform-finance-service/src/main/java/com/gic/finance/service/impl/CashWithdrawalServiceImpl.java

+package com.gic.finance.service.impl;
+
+import com.gic.commons.util.EntityUtil;
+import com.gic.finance.dao.mapper.TabCashWithdrawalMapper;
+import com.gic.finance.dto.CashWithdrawalDTO;
+import com.gic.finance.entity.TabCashWithdrawal;
+import com.gic.finance.qo.CashWithdrawalQueryListQO;
+import com.gic.finance.service.CashWithdrawalService;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service("cashWithdrawalService")
+public class CashWithdrawalServiceImpl implements CashWithdrawalService {
+    @Autowired
+    private TabCashWithdrawalMapper tabCashWithdrawalMapper;
+
+    @Override
+    public void save(CashWithdrawalDTO dto) {
+        tabCashWithdrawalMapper.insertSelective(EntityUtil.changeEntityNew(TabCashWithdrawal.class, dto));
+    }
+
+    @Override
+    public void update(TabCashWithdrawal record) {
+        record.setUpdateTime(new Date());
+        tabCashWithdrawalMapper.updateByPrimaryKeySelective(record);
+    }
+
+    @Override
+    public Page<TabCashWithdrawal> pageCashWithdrawal(CashWithdrawalQueryListQO params) {
+        PageHelper.startPage(params.getCurrentPage(), params.getPageSize());
+        List<TabCashWithdrawal> list = tabCashWithdrawalMapper.listCashWithdrawal(params);
+        return (Page<TabCashWithdrawal>) list;
+    }
+
+    @Override
+    public TabCashWithdrawal getById(Integer id) {
+        return tabCashWithdrawalMapper.selectByPrimaryKey(id);
+    }
+}

gic-platform-finance-service/src/main/java/com/gic/finance/service/outer/impl/CashWithdrawalApiServiceImpl.java

+package com.gic.finance.service.outer.impl;
+
+import java.util.Date;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.EntityUtil;
+import com.gic.commons.util.PageHelperUtils;
+import com.gic.enterprise.error.ErrorCode;
+import com.gic.enterprise.utils.valid.ValidParamsUtils;
+import com.gic.finance.constant.WithdrawalApplyTypeEnum;
+import com.gic.finance.constant.WithdrawalStatusEnum;
+import com.gic.finance.dto.CashWithdrawalDTO;
+import com.gic.finance.entity.TabCashWithdrawal;
+import com.gic.finance.entity.TabPayAccount;
+import com.gic.finance.qo.CashWithdrawalQueryListQO;
+import com.gic.finance.service.CashWithdrawalApiService;
+import com.gic.finance.service.CashWithdrawalService;
+import com.gic.finance.service.PayAccountService;
+import com.gic.store.utils.CreateSerialNumberUtils;
+
+@Service("cashWithdrawalApiService")
+public class CashWithdrawalApiServiceImpl implements CashWithdrawalApiService{
+    @Autowired
+    private CashWithdrawalService cashWithdrawalService;
+    @Autowired
+    private PayAccountService payAccountService;
+    /**
+     * 提现申请
+     * @Title: cashWithdrawal

+     * @Description:
+    
 * @author guojuxing
+     * @param dto

+     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Void>

+    
 */
+    private ServiceResponse<Void> cashWithdrawal(CashWithdrawalDTO dto) {
+        ServiceResponse paramValid = ValidParamsUtils.allCheckValidate(dto, CashWithdrawalDTO.CashWithdrawal.class);
+        if (!paramValid.isSuccess()) {
+            return paramValid;
+        }
+        dto.setCreateTime(new Date());
+        dto.setUpdateTime(new Date());
+        dto.setCashWithdrawalStatus(WithdrawalStatusEnum.TO_BE_EXAMINE.getCode());
+        //流水号
+        dto.setCashWithdrawalSerialNumber(CreateSerialNumberUtils.createSerialNumber());
+        cashWithdrawalService.save(dto);
+        return ServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<Void> cashWithdrawalOfServiceProvider(CashWithdrawalDTO dto) {
+        dto.setApplyType(WithdrawalApplyTypeEnum.SERVICE_PROVIDER.getCode());
+        return cashWithdrawal(dto);
+    }
+
+    @Override
+    public ServiceResponse<Void> cashWithdrawalOfSupplier(CashWithdrawalDTO dto) {
+        dto.setApplyType(WithdrawalApplyTypeEnum.SUPPLIER.getCode());
+        return cashWithdrawal(dto);
+    }
+
+    @Override
+    public ServiceResponse<Void> approval(Integer id) {
+        TabCashWithdrawal record = cashWithdrawalService.getById(id);
+        if (record == null) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "参数有误，无此记录");
+        }
+        //todo 操作人相关信息
+
+        record.setCashWithdrawalStatus(WithdrawalStatusEnum.PASS.getCode());
+        cashWithdrawalService.update(record);
+        return ServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<CashWithdrawalDTO> getDetail(Integer id) {
+        TabCashWithdrawal record = cashWithdrawalService.getById(id);
+        if (record == null) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "参数有误，无此记录");
+        }
+        return ServiceResponse.success(EntityUtil.changeEntityNew(CashWithdrawalDTO.class, record));
+    }
+
+    @Override
+    public ServiceResponse<Void> reject(Integer id, String rejectReason) {
+        if (StringUtils.isBlank(rejectReason)) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "驳回理由不能为空");
+        }
+        TabCashWithdrawal record = cashWithdrawalService.getById(id);
+        if (record == null) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "参数有误，无此记录");
+        }
+        //todo 操作人相关信息
+
+        record.setCashWithdrawalStatus(WithdrawalStatusEnum.REJECT.getCode());
+        record.setRejectReason(rejectReason);
+        cashWithdrawalService.update(record);
+        return ServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<Void> pay(Integer id, Integer payId, String bankSerialNumber) {
+        if (StringUtils.isBlank(bankSerialNumber)) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "银行流水号不能为空");
+        }
+        TabCashWithdrawal record = cashWithdrawalService.getById(id);
+        if (record == null) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "参数有误，无此申请单记录");
+        }
+        TabPayAccount account = payAccountService.getById(payId);
+        if (account == null) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "无此打款户信息记录，请前往添加");
+        }
+        //todo 操作人相关信息
+
+        record.setPayId(payId);
+        record.setPayAccount(account.getBankAccount());
+        record.setPayAccountBank(account.getBank());
+        record.setPayAccountBranchName(account.getBranchName());
+        record.setPayAccountName(account.getAccountName());
+        record.setBankSerialNumber(bankSerialNumber);
+        record.setCashWithdrawalStatus(WithdrawalStatusEnum.COMPLETE.getCode());
+        cashWithdrawalService.update(record);
+        return ServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<Page<CashWithdrawalDTO>> listCashWithdrawalPage(CashWithdrawalQueryListQO params) {
+        com.github.pagehelper.Page page = cashWithdrawalService.pageCashWithdrawal(params);
+        Page<CashWithdrawalDTO> resultPage = PageHelperUtils.changePageHelperToCurrentPage(page, CashWithdrawalDTO.class);
+        return ServiceResponse.success(resultPage);
+    }
+
+}

gic-platform-finance-service/src/main/resources/dubbo-gic-platform-finance-service.xml

@@ -23,5 +23,7 @@
     <dubbo:service interface="com.gic.finance.service.InvoiceAccountApiService" ref="invoiceAccountApiService" timeout="6000" />
     <!--打款户信息-->
     <dubbo:service interface="com.gic.finance.service.PayAccountApiService" ref="payAccountApiService" timeout="6000" />
+    <!--提现管理-->
+    <dubbo:service interface="com.gic.finance.service.CashWithdrawalApiService" ref="cashWithdrawalApiService" timeout="6000" />
 
 </beans>

gic-platform-finance-web/src/main/java/com/gic/finance/web/controller/CashWithdrawalController.java

 package com.gic.finance.web.controller;
 
+import com.gic.finance.qo.CashWithdrawalQueryListQO;
+import com.gic.finance.service.CashWithdrawalApiService;
+import com.gic.finance.web.vo.CashWithdrawalDetailVO;
+import com.gic.finance.web.vo.CashWithdrawalListVO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,6 +14,7 @@ import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.finance.dto.PayAccountDTO;
 import com.gic.finance.service.PayAccountApiService;
+
 /**
  * 提现管理
  * @ClassName: CashWithdrawalController

@@ -24,6 +29,8 @@ public class CashWithdrawalController {
 
     @Autowired
     private PayAccountApiService payAccountApiService;
+    @Autowired
+    private CashWithdrawalApiService cashWithdrawalApiService;
 
     /**
      * 新增打款账户
@@ -90,4 +97,65 @@ public class CashWithdrawalController {
     public RestResponse listPayAccount() {
         return ResultControllerUtils.commonResult(payAccountApiService.listPayAccount());
     }
+
+    /**
+     * 提现管理列表
+     * @Title: listCashWithdrawal

+     * @Description:
+    
 * @author guojuxing
+     * @param params

+     * @return  com.gic.commons.webapi.reponse.RestResponse

+    
 */
+    @RequestMapping("/list-cash-withdrawal")
+    public RestResponse listCashWithdrawal(CashWithdrawalQueryListQO params) {
+        return ResultControllerUtils.commonPageResult(cashWithdrawalApiService.listCashWithdrawalPage(params),
+                CashWithdrawalListVO.class);
+    }
+
+    /**
+     * 审批通过
+     * @Title: approval

+     * @Description:
+    
 * @author guojuxing
+     * @param id

+     * @return  com.gic.commons.webapi.reponse.RestResponse

+    
 */
+    @RequestMapping("/approval")
+    public RestResponse approval(Integer id) {
+        return ResultControllerUtils.commonResult(cashWithdrawalApiService.approval(id));
+    }
+
+    /**
+     * 驳回
+     * @Title: reject

+     * @Description:
+    
 * @author guojuxing
+     * @param id
+     * @param rejectReason

+     * @return  com.gic.commons.webapi.reponse.RestResponse

+    
 */
+    @RequestMapping("/approval")
+    public RestResponse reject(Integer id, String rejectReason) {
+        return ResultControllerUtils.commonResult(cashWithdrawalApiService.reject(id, rejectReason));
+    }
+
+    /**
+     * 打款
+     * @Title: pay

+     * @Description:
+    
 * @author guojuxing
+     * @param id
+     * @param payId 打款户ID
+     * @param bankSerialNumber
 银行转账流水号
+     * @return  com.gic.commons.webapi.reponse.RestResponse

+    
 */
+    @RequestMapping("/pay")
+    public RestResponse pay(Integer id, Integer payId, String bankSerialNumber) {
+        return ResultControllerUtils.commonResult(cashWithdrawalApiService.pay(id, payId, bankSerialNumber));
+    }
+
+    @RequestMapping("/get-detail")
+    public RestResponse getDetail(Integer id) {
+        return ResultControllerUtils.commonResultOne(cashWithdrawalApiService.getDetail(id), CashWithdrawalDetailVO.class);
+    }
 }

gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/CashWithdrawalDetailVO.java

+package com.gic.finance.web.vo;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.gic.finance.constant.WithdrawalApplyTypeEnum;
+import com.gic.finance.constant.WithdrawalStatusEnum;
+
+/**
+ * 提现管理详情
+ * @ClassName: CashWithdrawalListVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2019/8/30 10:41 AM

+ */
+public class CashWithdrawalDetailVO implements Serializable{
+
+    private static final long serialVersionUID = 1601094826663117214L;
+    /**
+     *
+     */
+    private Integer cashWithdrawalId;
+
+    /**
+     * 申请单流水号
+     */
+    private String cashWithdrawalSerialNumber;
+
+    /**
+     * 申请方类型 1:服务商 2:供应商
+     */
+    private Integer applyType;
+
+    private String applyTypeStr;
+
+    /**
+     * 提现金额
+     */
+    private Double cashWithdrawalAmount;
+
+    /**
+     * 提现状态 1:待审核 2:审核通过 3:已完成 4:已取消 5:已驳回
+     */
+    private Integer cashWithdrawalStatus;
+
+    private String cashWithdrawalStatusStr;
+
+    /**
+     * 驳回理由
+     */
+    private String rejectReason;
+
+    /**
+     * 操作人姓名
+     */
+    private String operatorName;
+
+    /**
+     * 操作时间
+     */
+    private Date operatorTime;
+
+    /**
+     * 操作人手机号码
+     */
+    private String operatorPhone;
+
+    /**
+     * 操作人手机号国际区号
+     */
+    private String operatorPhoneAreaCode;
+
+    /**
+     * 收款开户名称
+     */
+    private String receiptName;
+
+    /**
+     * 收款支行名称
+     */
+    private String receiptBranchName;
+
+    /**
+     * 收款开户行
+     */
+    private String receiptBank;
+
+    /**
+     * 收款银行账号
+     */
+    private String receiptBankAccount;
+
+    /**
+     * 打款户开户名称
+     */
+    private String payAccountName;
+
+    /**
+     * 打款户支行名称
+     */
+    private String payAccountBranchName;
+
+    /**
+     * 打款户开户行
+     */
+    private String payAccountBank;
+
+    /**
+     * 打款户银行账号
+     */
+    private String payAccount;
+
+    /**
+     * 物流公司
+     */
+    private String expressMailName;
+
+    /**
+     * 发票物流号
+     */
+    private String expressMailNumber;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    public Integer getCashWithdrawalId() {
+        return cashWithdrawalId;
+    }
+
+    public void setCashWithdrawalId(Integer cashWithdrawalId) {
+        this.cashWithdrawalId = cashWithdrawalId;
+    }
+
+    public String getCashWithdrawalSerialNumber() {
+        return cashWithdrawalSerialNumber;
+    }
+
+    public void setCashWithdrawalSerialNumber(String cashWithdrawalSerialNumber) {
+        this.cashWithdrawalSerialNumber = cashWithdrawalSerialNumber;
+    }
+
+    public void setApplyType(Integer applyType) {
+        this.applyType = applyType;
+    }
+
+    public String getApplyTypeStr() {
+        return WithdrawalApplyTypeEnum.getMessageByCode(applyType);
+    }
+
+    public Double getCashWithdrawalAmount() {
+        return cashWithdrawalAmount;
+    }
+
+    public void setCashWithdrawalAmount(Double cashWithdrawalAmount) {
+        this.cashWithdrawalAmount = cashWithdrawalAmount;
+    }
+
+    public Integer getCashWithdrawalStatus() {
+        return cashWithdrawalStatus;
+    }
+
+    public void setCashWithdrawalStatus(Integer cashWithdrawalStatus) {
+        this.cashWithdrawalStatus = cashWithdrawalStatus;
+    }
+
+    public String getCashWithdrawalStatusStr() {
+        return WithdrawalStatusEnum.getMessageByCode(cashWithdrawalStatus);
+    }
+
+    public String getRejectReason() {
+        return rejectReason;
+    }
+
+    public void setRejectReason(String rejectReason) {
+        this.rejectReason = rejectReason;
+    }
+
+    public String getOperatorName() {
+        return operatorName;
+    }
+
+    public void setOperatorName(String operatorName) {
+        this.operatorName = operatorName;
+    }
+
+    public Date getOperatorTime() {
+        return operatorTime;
+    }
+
+    public void setOperatorTime(Date operatorTime) {
+        this.operatorTime = operatorTime;
+    }
+
+    public String getReceiptName() {
+        return receiptName;
+    }
+
+    public void setReceiptName(String receiptName) {
+        this.receiptName = receiptName;
+    }
+
+    public String getReceiptBranchName() {
+        return receiptBranchName;
+    }
+
+    public void setReceiptBranchName(String receiptBranchName) {
+        this.receiptBranchName = receiptBranchName;
+    }
+
+    public String getReceiptBank() {
+        return receiptBank;
+    }
+
+    public void setReceiptBank(String receiptBank) {
+        this.receiptBank = receiptBank;
+    }
+
+    public String getReceiptBankAccount() {
+        return receiptBankAccount;
+    }
+
+    public void setReceiptBankAccount(String receiptBankAccount) {
+        this.receiptBankAccount = receiptBankAccount;
+    }
+
+    public String getPayAccountName() {
+        return payAccountName;
+    }
+
+    public void setPayAccountName(String payAccountName) {
+        this.payAccountName = payAccountName;
+    }
+
+    public String getPayAccountBranchName() {
+        return payAccountBranchName;
+    }
+
+    public void setPayAccountBranchName(String payAccountBranchName) {
+        this.payAccountBranchName = payAccountBranchName;
+    }
+
+    public String getPayAccountBank() {
+        return payAccountBank;
+    }
+
+    public void setPayAccountBank(String payAccountBank) {
+        this.payAccountBank = payAccountBank;
+    }
+
+    public String getPayAccount() {
+        return payAccount;
+    }
+
+    public void setPayAccount(String payAccount) {
+        this.payAccount = payAccount;
+    }
+
+    public String getExpressMailName() {
+        return expressMailName;
+    }
+
+    public void setExpressMailName(String expressMailName) {
+        this.expressMailName = expressMailName;
+    }
+
+    public String getExpressMailNumber() {
+        return expressMailNumber;
+    }
+
+    public void setExpressMailNumber(String expressMailNumber) {
+        this.expressMailNumber = expressMailNumber;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getOperatorPhone() {
+        return operatorPhone;
+    }
+
+    public void setOperatorPhone(String operatorPhone) {
+        this.operatorPhone = operatorPhone;
+    }
+
+    public String getOperatorPhoneAreaCode() {
+        return operatorPhoneAreaCode;
+    }
+
+    public void setOperatorPhoneAreaCode(String operatorPhoneAreaCode) {
+        this.operatorPhoneAreaCode = operatorPhoneAreaCode;
+    }
+}

gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/CashWithdrawalListVO.java

+package com.gic.finance.web.vo;
+
+import com.gic.finance.constant.WithdrawalApplyTypeEnum;
+import com.gic.finance.constant.WithdrawalStatusEnum;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 提现管理列表
+ * @ClassName: CashWithdrawalListVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2019/8/30 10:41 AM

+ */
+public class CashWithdrawalListVO implements Serializable{
+    private static final long serialVersionUID = 7588915723413260711L;
+
+    /**
+     *
+     */
+    private Integer cashWithdrawalId;
+
+    /**
+     * 申请单流水号
+     */
+    private String cashWithdrawalSerialNumber;
+
+    /**
+     * 申请方类型 1:服务商 2:供应商
+     */
+    private Integer applyType;
+
+    private String applyTypeStr;
+
+    /**
+     * 提现金额
+     */
+    private Double cashWithdrawalAmount;
+
+    /**
+     * 提现状态 1:待审核 2:审核通过 3:已完成 4:已取消 5:已驳回
+     */
+    private Integer cashWithdrawalStatus;
+
+    private String cashWithdrawalStatusStr;
+
+    /**
+     * 操作人姓名
+     */
+    private String operatorName;
+
+    /**
+     * 操作时间
+     */
+    private Date operatorTime;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    public Integer getCashWithdrawalId() {
+        return cashWithdrawalId;
+    }
+
+    public void setCashWithdrawalId(Integer cashWithdrawalId) {
+        this.cashWithdrawalId = cashWithdrawalId;
+    }
+
+    public String getCashWithdrawalSerialNumber() {
+        return cashWithdrawalSerialNumber;
+    }
+
+    public void setCashWithdrawalSerialNumber(String cashWithdrawalSerialNumber) {
+        this.cashWithdrawalSerialNumber = cashWithdrawalSerialNumber;
+    }
+
+    public void setApplyType(Integer applyType) {
+        this.applyType = applyType;
+    }
+
+    public String getApplyTypeStr() {
+        return WithdrawalApplyTypeEnum.getMessageByCode(applyType);
+    }
+
+    public Double getCashWithdrawalAmount() {
+        return cashWithdrawalAmount;
+    }
+
+    public void setCashWithdrawalAmount(Double cashWithdrawalAmount) {
+        this.cashWithdrawalAmount = cashWithdrawalAmount;
+    }
+
+    public Integer getCashWithdrawalStatus() {
+        return cashWithdrawalStatus;
+    }
+
+    public void setCashWithdrawalStatus(Integer cashWithdrawalStatus) {
+        this.cashWithdrawalStatus = cashWithdrawalStatus;
+    }
+
+    public String getCashWithdrawalStatusStr() {
+        return WithdrawalStatusEnum.getMessageByCode(cashWithdrawalStatus);
+    }
+
+
+    public String getOperatorName() {
+        return operatorName;
+    }
+
+    public void setOperatorName(String operatorName) {
+        this.operatorName = operatorName;
+    }
+
+    public Date getOperatorTime() {
+        return operatorTime;
+    }
+
+    public void setOperatorTime(Date operatorTime) {
+        this.operatorTime = operatorTime;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/InvoiceManagerDetailVO.java

 package com.gic.finance.web.vo;
 
-import com.gic.finance.constant.InvoiceStatusEnum;
-import com.gic.finance.constant.InvoiceTypeEnum;
-
 import java.io.Serializable;
 import java.util.Date;
 
+import com.gic.finance.constant.InvoiceStatusEnum;
+import com.gic.finance.constant.InvoiceTypeEnum;
+
 /**
  * 发票管理详情
  * @ClassName: InvoiceManagerDetailVO

@@ -125,6 +125,20 @@ public class InvoiceManagerDetailVO implements Serializable{
      * 开户账号
      */
     private String bankAccount;
+    /**
+     * 收货人
+     */
+    private String shippingName;
+
+    /**
+     * 收货电话
+     */
+    private String shippingPhone;
+
+    /**
+     * 收货地址
+     */
+    private String shippingAddress;
 
     public Integer getInvoiceManageId() {
         return invoiceManageId;
@@ -301,4 +315,28 @@ public class InvoiceManagerDetailVO implements Serializable{
     public void setBankAccount(String bankAccount) {
         this.bankAccount = bankAccount;
     }
+
+    public String getShippingName() {
+        return shippingName;
+    }
+
+    public void setShippingName(String shippingName) {
+        this.shippingName = shippingName;
+    }
+
+    public String getShippingPhone() {
+        return shippingPhone;
+    }
+
+    public void setShippingPhone(String shippingPhone) {
+        this.shippingPhone = shippingPhone;
+    }
+
+    public String getShippingAddress() {
+        return shippingAddress;
+    }
+
+    public void setShippingAddress(String shippingAddress) {
+        this.shippingAddress = shippingAddress;
+    }
 }

gic-platform-finance-web/src/main/resources/dubbo-gic-platform-finance-web.xml

@@ -44,6 +44,9 @@
     <dubbo:reference interface="com.gic.finance.service.InvoiceAccountApiService" id="invoiceAccountApiService" timeout="60000" />
     <!--打款户信息-->
     <dubbo:reference interface="com.gic.finance.service.PayAccountApiService" id="payAccountApiService" timeout="60000" />
+    <!--提现管理-->
+    <dubbo:reference interface="com.gic.finance.service.CashWithdrawalApiService" id="cashWithdrawalApiService" timeout="60000" />
+
     <dubbo:reference id="gicLogService" interface="com.gic.authcenter.api.service.GicLogService"/>
     <dubbo:reference id="gicAppService" interface="com.gic.authcenter.api.service.GicAppService"/>
     <dubbo:reference id="gicUserService" interface="com.gic.authcenter.api.service.GicUserService"/>