新增银行业务接口

mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/BankBusinessController.java

@@ -4,18 +4,13 @@ import com.muchinfo.mtp3century.service.IBankBusinessService;
 import com.muchinfo.mtp3century.utils.AjaxResult;
 import com.muchinfo.mtp3common.vo.PageResult;
 import com.muchinfo.mtp3pojos.entity.*;
-import com.muchinfo.mtp3pojos.vo.bankaccountsign.AccountSignQueryParam;
-import com.muchinfo.mtp3pojos.vo.bankaccountsign.AccountSignQueryResult;
 import com.muchinfo.mtp3pojos.vo.bankbusiness.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -29,121 +24,163 @@ public class BankBusinessController {
     private IBankBusinessService iBankBusinessService;
 
     @ApiOperation("银行业务->银行系统配置-->详情")
-    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.GET, value = "/banksystemconfig")
     public AjaxResult<BankSystemconfig> banksystemconfig(HttpServletRequest request) {
         return iBankBusinessService.banksystemconfig(request);
     }
 
     @ApiOperation("银行业务->银行系统配置-->编辑")
-    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.POST, value = "/saveSystemDetail")
     public AjaxResult saveSystemDetail(@RequestBody BankSystemConfigParam param, HttpServletRequest request) {
         return iBankBusinessService.saveSystemDetail(param, request);
     }
 
     @ApiOperation("银行业务->托管银行配置-->获取列表")
-    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.GET, value = "/bankcusquery")
     public AjaxResult<BankCusbankinfo> bankcusquery(HttpServletRequest request) {
         return iBankBusinessService.bankcusquery(request);
     }
 
     @ApiOperation("银行业务->托管银行配置-->详情")
-    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.GET, value = "/bankcusdetail")
     public AjaxResult<BankCusbankinfoDetailResult> bankcusdetail(String cusbankid, HttpServletRequest request) {
         return iBankBusinessService.bankcusdetail(cusbankid, request);
     }
 
     @ApiOperation("银行业务->托管银行配置-->获取平台开户银行")
-    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.GET, value = "/queryBankInfoSelect")
     public AjaxResult<BankBankinfo> queryBankInfoSelect(String searchcode, HttpServletRequest request) {
         return iBankBusinessService.queryBankInfoSelect(searchcode, request);
     }
 
     @ApiOperation("银行业务->托管银行配置-->新增/修改")
-    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.POST, value = "/dealBankInfo")
     public AjaxResult dealBankInfo(@RequestBody BankCusBankInfoParam param, HttpServletRequest request) {
         return iBankBusinessService.dealBankInfo(param, request);
     }
 
     @ApiOperation("银行业务->托管银行配置-->删除")
-    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.GET, value = "/deleteBankInfo")
     public AjaxResult deleteBankInfo(String cusbankid, HttpServletRequest request) {
         return iBankBusinessService.deleteBankInfo(cusbankid, request);
     }
 
     @ApiOperation("银行业务->托管银行配置-->扩展配置-->获取列表")
-    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.GET, value = "/queryExtendset")
     public AjaxResult<BankCusbankextendconfig> queryExtendset(String cusbankid, HttpServletRequest request) {
         return iBankBusinessService.queryExtendset(cusbankid, request);
     }
 
     @ApiOperation("银行业务->托管银行配置-->扩展配置-->新增、修改初始化信息")
-    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.GET, value = "/extendBizTypeInit")
     public AjaxResult<BankExtendBizTypeResult> extendBizTypeInit(String cusbankid, HttpServletRequest request) {
         return iBankBusinessService.extendBizTypeInit(cusbankid, request);
     }
 
     @ApiOperation("银行业务->托管银行配置-->扩展配置-->详情")
-    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.GET, value = "/extendDetail")
     public AjaxResult<BankCusbankextendconfig> extendDetail(String cusbankid, Integer extendbiztype, HttpServletRequest request) {
         return iBankBusinessService.extendDetail(cusbankid, extendbiztype, request);
     }
 
     @ApiOperation("银行业务-托管银行配置-->扩展配置-->新增/修改")
-    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.POST, value = "/dealBankExtend")
     public AjaxResult dealBankExtend(@RequestBody BankExtendAddParam param, HttpServletRequest request) {
         return iBankBusinessService.dealBankExtend(param, request);
     }
 
     @ApiOperation("银行业务->托管银行配置-->扩展配置-->删除")
-    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.GET, value = "/delExtend")
     public AjaxResult delExtend(String cusbankid, Integer extendbiztype, HttpServletRequest request) {
         return iBankBusinessService.delExtend(cusbankid, extendbiztype, request);
     }
 
     @ApiOperation("银行业务->托管银行配置-->支持银行-->获取列表")
-    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.GET, value = "/queryBankSignList")
     public AjaxResult<BankCusbanksignbank> queryBankSignList(String cusbankid, HttpServletRequest request) {
         return iBankBusinessService.queryBankSignList(cusbankid, request);
     }
 
     @ApiOperation("银行业务->托管银行配置-->支持银行-->获取排除银行列表")
-    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.GET, value = "/queryBankInfoNotExist")
     public AjaxResult<BankBankinfo> queryBankInfoNotExist(String cusbankid, HttpServletRequest request) {
         return iBankBusinessService.queryBankInfoNotExist(cusbankid, request);
     }
 
     @ApiOperation("银行业务->托管银行配置-->扩展配置-->删除")
-    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.GET, value = "/delBankInfo")
     public AjaxResult delBankInfo(String cusbankid, Integer bankid, HttpServletRequest request) {
         return iBankBusinessService.delBankInfo(cusbankid, bankid, request);
     }
 
     @ApiOperation("银行业务-托管银行配置-->扩展配置-->新增")
-    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     @RequestMapping(method = RequestMethod.POST, value = "/dealBankCusBankSign")
     public AjaxResult dealBankCusBankSign(@RequestBody BankCusBankSignAddParam param, HttpServletRequest request) {
         return iBankBusinessService.dealBankCusBankSign(param, request);
     }
 
-    @ApiOperation("银行业务->托管银行配置-->获取列表")
+    @ApiOperation("银行业务->托管银行配置-->签解约查询-->获取列表")
     @ApiResponse(code = 200, message = "成功", response = PageResult.class)
     @RequestMapping(method = RequestMethod.GET, value = "/signLogQuery")
     public PageResult<BankAccountSignLogQueryResult> signLogQuery(BankAccountSignLogQueryParam param, HttpServletRequest request) {
         return iBankBusinessService.signLogQuery(param, request);
     }
+
+    @ApiOperation("银行业务->托管银行配置-->签解约查询-->详情")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    @RequestMapping(method = RequestMethod.GET, value = "/signLogDetail")
+    public AjaxResult<BankAccountsignlog> signLogDetail(String cusbankid, Integer exchticket, HttpServletRequest request) {
+        return iBankBusinessService.signLogDetail(cusbankid, exchticket, request);
+    }
+
+    @RequestMapping(method = RequestMethod.GET, value = "/signLogExport")
+    @ApiOperation("银行业务->托管银行配置-->签解约查询-->导出")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    public AjaxResult signLogExport(BankAccountSignLogQueryParam param, HttpServletRequest request) {
+        return iBankBusinessService.signLogExport(param, request);
+    }
+
+    @ApiOperation("银行业务->托管银行配置-->出入金银行配置-->获取列表")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    @RequestMapping(method = RequestMethod.GET, value = "/querymixbanklist")
+    public AjaxResult<HybridChannelConfig> querymixbanklist(HttpServletRequest request) {
+        return iBankBusinessService.querymixbanklist(request);
+    }
+
+    @ApiOperation("银行业务->托管银行配置-->出入金银行配置-->修改")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    @RequestMapping(method = RequestMethod.GET, value = "/mixbankeditsubmit")
+    public AjaxResult mixbankeditsubmit(@RequestBody BankMixBankUpdateParam param, HttpServletRequest request) {
+        return iBankBusinessService.mixbankeditsubmit(param, request);
+    }
+
+    @ApiOperation("银行业务->托管银行配置-->出入金银行配置-->删除")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    @RequestMapping(method = RequestMethod.GET, value = "/deletemixbankedit")
+    public AjaxResult deletemixbankedit(String channelCode, HttpServletRequest request) {
+        return iBankBusinessService.deletemixbankedit(channelCode, request);
+    }
+
+    @ApiOperation("银行业务->托管银行配置-->出入金银行配置-->出入金银行流水-->获取列表")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    @RequestMapping(method = RequestMethod.GET, value = "/querychannelbanklist")
+    public PageResult<HybridBankinfo> querychannelbanklist(BankChannleBankParam param, HttpServletRequest request) {
+        return iBankBusinessService.querychannelbanklist(param, request);
+    }
 }

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/IBankBusinessService.java

@@ -41,4 +41,16 @@ public interface IBankBusinessService {
     AjaxResult dealBankCusBankSign(BankCusBankSignAddParam param, HttpServletRequest request);
 
     PageResult<BankAccountSignLogQueryResult> signLogQuery(BankAccountSignLogQueryParam param, HttpServletRequest request);
+
+    AjaxResult<BankAccountsignlog> signLogDetail(String cusbankid, Integer exchticket, HttpServletRequest request);
+
+    AjaxResult signLogExport(BankAccountSignLogQueryParam param, HttpServletRequest request);
+
+    AjaxResult<HybridChannelConfig> querymixbanklist(HttpServletRequest request);
+
+    AjaxResult mixbankeditsubmit(BankMixBankUpdateParam param, HttpServletRequest request);
+
+    AjaxResult deletemixbankedit(String channelCode, HttpServletRequest request);
+
+    PageResult<HybridBankinfo> querychannelbanklist(BankChannleBankParam param, HttpServletRequest request);
 }

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/BankBusinessServiceImpl.java

@@ -1,6 +1,10 @@
 package com.muchinfo.mtp3century.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.muchinfo.mtp3century.exception.GlobalException;
 import com.muchinfo.mtp3century.service.IBankBusinessService;
 import com.muchinfo.mtp3century.service.ICommonService;
@@ -9,10 +13,15 @@ import com.muchinfo.mtp3common.enumtype.Constants;
 import com.muchinfo.mtp3common.enumtype.MessageType;
 import com.muchinfo.mtp3common.enumtype.SysConstants;
 import com.muchinfo.mtp3common.utils.DateTimeUtils;
+import com.muchinfo.mtp3common.utils.EncryptionUtils;
+import com.muchinfo.mtp3common.utils.ExportUtil;
+import com.muchinfo.mtp3common.vo.ExportResult;
 import com.muchinfo.mtp3common.vo.PageResult;
 import com.muchinfo.mtp3interface.mapper.*;
 import com.muchinfo.mtp3pojos.entity.*;
 import com.muchinfo.mtp3pojos.vo.bankbusiness.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,14 +29,12 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class BankBusinessServiceImpl implements IBankBusinessService {
 
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
     @Resource
     private IBankSystemconfigMapper iBankSystemconfigMapper;
     @Resource
@@ -56,7 +63,12 @@ public class BankBusinessServiceImpl implements IBankBusinessService {
     private IBankExtendfieldMapper iBankExtendfieldMapper;
     @Resource
     private IEnumdicitemMapper iEnumdicitemMapper;
-
+    @Resource
+    private IBankAccountsignlogMapper iBankAccountsignlogMapper;
+    @Resource
+    private IHybridChannelConfigMapper iHybridChannelConfigMapper;
+    @Resource
+    private IHybridBankinfoMapper iHybridBankinfoMapper;
 
     @Override
     public AjaxResult<BankSystemconfig> banksystemconfig(HttpServletRequest request) {
@@ -455,7 +467,128 @@ public class BankBusinessServiceImpl implements IBankBusinessService {
 
     @Override
     public PageResult<BankAccountSignLogQueryResult> signLogQuery(BankAccountSignLogQueryParam param, HttpServletRequest request) {
+        if (param.getStartdate() != null && !param.getStartdate().isEmpty()) {
+            param.setStartdate(param.getStartdate() + " 00:00:00");
+        }
+        if (param.getEnddate() != null && !param.getEnddate().isEmpty()) {
+            param.setEnddate(param.getEnddate() + " 23:59:59");
+        }
+        param.setAccountcode(param.getAccountcode() == null ?
+                null : param.getAccountcode().trim());
+        if (param.getUsertype() != null) {
+            if (param.getUsertype() == 2) {
+                param.setUsertypes("2,3");
+            } else {
+                param.setUsertypes(param.getUsertype().toString());
+            }
+        }
 
-        return null;
+        IPage<BankAccountSignLogQueryResult> page = new Page<>(param.getPageNum(), param.getPageSize());
+        IPage<BankAccountSignLogQueryResult> resultPage = iBankAccountsignlogMapper.signLogQuery(page, param);
+        //返回列表
+        PageResult<BankAccountSignLogQueryResult> pageResult = new PageResult<>();
+        pageResult.setCode(Constants.Success_Code_Design);
+        pageResult.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
+        pageResult.setPages(resultPage.getPages());
+        pageResult.setCurrent(resultPage.getCurrent());
+        pageResult.setTotal(resultPage.getTotal());
+        pageResult.setPageSize(resultPage.getSize());
+        pageResult.setData(resultPage.getRecords());
+        return pageResult;
     }
+
+    @Override
+    public AjaxResult<BankAccountsignlog> signLogDetail(String cusbankid, Integer exchticket, HttpServletRequest request) {
+        BankAccountsignlog sign = iBankAccountsignlogMapper.selectOne(new QueryWrapper<BankAccountsignlog>()
+                .eq("cusbankid", cusbankid)
+                .eq("exchticket", exchticket));
+
+        //出入金查询
+        sign.setBankaccountname(EncryptionUtils.decryptForAES(sign.getBankaccountname()));
+        sign.setAccountname(EncryptionUtils.decryptForAES(sign.getAccountname()));
+        sign.setMobilephone(EncryptionUtils.decryptForAES(sign.getMobilephone()));
+        sign.setCardno(EncryptionUtils.decryptForAES(sign.getCardno()));
+        sign.setBankaccountno(EncryptionUtils.decryptForAES(sign.getBankaccountno()));
+
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), sign);
+    }
+
+    @Override
+    public AjaxResult signLogExport(BankAccountSignLogQueryParam param, HttpServletRequest request) {
+        if (param.getStartdate() != null && !param.getStartdate().isEmpty()) {
+            param.setStartdate(param.getStartdate() + " 00:00:00");
+        }
+        if (param.getEnddate() != null && !param.getEnddate().isEmpty()) {
+            param.setEnddate(param.getEnddate() + " 23:59:59");
+        }
+        param.setAccountcode(param.getAccountcode() == null ?
+                null : param.getAccountcode().trim());
+        if (param.getUsertype() != null) {
+            if (param.getUsertype() == 2) {
+                param.setUsertypes("2,3");
+            } else {
+                param.setUsertypes(param.getUsertype().toString());
+            }
+        }
+        try {
+            String fileName = "签解约查询_" + DateTimeUtils.getDateTime("yyyyMMdd");
+            List<BankAccountSignLogQueryResult> resultIPage = iBankAccountsignlogMapper.signLogQuery(param);
+            if (CollectionUtils.isEmpty(resultIPage)) {
+                return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_006.getCode(), request.getHeader("Accept-Language"));
+            }
+            ExportResult exportResult = ExportUtil.write(fileName, BankAccountSignLogQueryResult.class, resultIPage);
+            return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), exportResult);
+        } catch (Exception e) {
+            log.error("签解约查询导出失败，失败原因：" + Arrays.toString(e.getStackTrace()));
+            return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_006.getCode(), request.getHeader("Accept-Language"));
+        }
+    }
+
+    @Override
+    public AjaxResult<HybridChannelConfig> querymixbanklist(HttpServletRequest request) {
+        List<HybridChannelConfig> configs = iHybridChannelConfigMapper.selectList(new QueryWrapper<>());
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), configs);
+    }
+
+    @Override
+    public AjaxResult mixbankeditsubmit(BankMixBankUpdateParam param, HttpServletRequest request) {
+        HybridChannelConfig vo = iHybridChannelConfigMapper.selectOne(new QueryWrapper<HybridChannelConfig>().eq("channelCode", param.getChannelCode()));
+        if (vo != null) {
+            vo.setChannelName(param.getChannelName());
+            vo.setCanAmtIn(param.getCanAmtIn());
+            vo.setCanAmtOut(param.getCanAmtOut());
+            iHybridChannelConfigMapper.update(vo, new QueryWrapper<HybridChannelConfig>().eq("channelCode", param.getChannelCode()));
+
+        }
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public AjaxResult deletemixbankedit(String channelCode, HttpServletRequest request) {
+        iHybridChannelConfigMapper.delete(new QueryWrapper<HybridChannelConfig>().eq("channelCode", channelCode));
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public PageResult<HybridBankinfo> querychannelbanklist(BankChannleBankParam param, HttpServletRequest request) {
+        IPage<HybridBankinfo> page = new Page<>(param.getPageNum(), param.getPageSize());
+        IPage<HybridBankinfo> resultPage = iHybridBankinfoMapper.selectPage(page, new QueryWrapper<HybridBankinfo>()
+                .eq(StringUtils.isNotBlank(param.getChannelCode()), "channel_code", param.getChannelCode())
+                .eq(param.getOutInFlag() != null, "out_in_flag", param.getOutInFlag())
+                .and(a -> a.like(StringUtils.isNotBlank(param.getBankCodeName()), "bank_code", param.getChannelCode())
+                        .or().like(StringUtils.isNotBlank(param.getBankCodeName()), "bank_name", param.getChannelCode())
+                ));
+        //返回列表
+        PageResult<HybridBankinfo> pageResult = new PageResult<>();
+        pageResult.setCode(Constants.Success_Code_Design);
+        pageResult.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
+        pageResult.setPages(resultPage.getPages());
+        pageResult.setCurrent(resultPage.getCurrent());
+        pageResult.setTotal(resultPage.getTotal());
+        pageResult.setPageSize(resultPage.getSize());
+        pageResult.setData(resultPage.getRecords());
+        return pageResult;
+    }
+
+
 }

mtp3-century/src/main/resources/mapper/BankAccountsignlogMapper.xml

@@ -0,0 +1,87 @@
+<?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.muchinfo.mtp3interface.mapper.IBankAccountsignlogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.muchinfo.mtp3pojos.entity.BankAccountsignlog">
+        <id column="EXCHTICKET" property="exchticket" />
+        <result column="DIRECT" property="direct" />
+        <result column="ACCOUNTCODE" property="accountcode" />
+        <result column="CUSBANKID" property="cusbankid" />
+        <result column="SIGNTYPE" property="signtype" />
+        <result column="ISFORCE" property="isforce" />
+        <result column="DEALSTATUS" property="dealstatus" />
+        <result column="CURRENCY" property="currency" />
+        <result column="ACCOUNTTYPE" property="accounttype" />
+        <result column="ACCOUNTNAME" property="accountname" />
+        <result column="BANKCARDTYPE" property="bankcardtype" />
+        <result column="BANKACCOUNTNO" property="bankaccountno" />
+        <result column="BANKACCOUNTTYPE" property="bankaccounttype" />
+        <result column="BANKCHILDACCOUNT" property="bankchildaccount" />
+        <result column="BANKID" property="bankid" />
+        <result column="BRANCHBANKID" property="branchbankid" />
+        <result column="BRANCHBANKNAME" property="branchbankname" />
+        <result column="BANKACCOUNTNAME" property="bankaccountname" />
+        <result column="CARDTYPE" property="cardtype" />
+        <result column="CARDNO" property="cardno" />
+        <result column="BANKPROVINCE" property="bankprovince" />
+        <result column="BANKCITY" property="bankcity" />
+        <result column="MOBILEPHONE" property="mobilephone" />
+        <result column="EXTENDINFO" property="extendinfo" />
+        <result column="CREATETIME" property="createtime" />
+        <result column="REMARK" property="remark" />
+        <result column="NETADDR" property="netaddr" />
+        <result column="CHANGEAMOUNT" property="changeamount" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        EXCHTICKET, DIRECT, ACCOUNTCODE, CUSBANKID, SIGNTYPE, ISFORCE, DEALSTATUS, CURRENCY, ACCOUNTTYPE, ACCOUNTNAME, BANKCARDTYPE, BANKACCOUNTNO, BANKACCOUNTTYPE, BANKCHILDACCOUNT, BANKID, BRANCHBANKID, BRANCHBANKNAME, BANKACCOUNTNAME, CARDTYPE, CARDNO, BANKPROVINCE, BANKCITY, MOBILEPHONE, EXTENDINFO, CREATETIME, REMARK, NETADDR, CHANGEAMOUNT
+    </sql>
+    <select id="signLogQuery"
+            resultType="com.muchinfo.mtp3pojos.vo.bankbusiness.BankAccountSignLogQueryResult">
+        select b.accountcode , b.accountname , b.cusbankid , b.exchticket ,
+        b.bankaccountno , b.bankaccountname , b.bankid , b.dealstatus ,
+        b.cardtype , b.cardno , b.currency , b.CREATETIME,
+        b.signtype , b.accounttype, b.bankchildaccount,
+        c.cusbankname, c.canmodifyphone,c.canmodifybankcard,c.canbindcard,
+        ta.userid,b.mobilephone,c.canmodifysigninfo
+        from (select row_number() over(partition by ExchTicket order by DealStatus desc,CreateTime desc)rn, a.* from Bank_AccountSignLog a) b
+        left join TAAccount ta on ta.accountid = b.accountcode
+        left join useraccount ua on ta.relateduserid = ua.userid
+        left join Bank_CusBankInfo c on b.cusbankid = c.cusbankid
+        <where>
+            b.rn =1
+            <if test="vo.usertypes != null and vo.usertypes != '' ">
+                and ua.usertype in (${vo.usertypes})
+            </if>
+            <if test="vo.accountcode != null and vo.accountcode != '' ">
+                and b.accountcode = #{vo.accountcode}
+            </if>
+            <if test="vo.signtype != null">
+                and b.signtype = #{vo.signtype}
+            </if>
+            <if test="vo.cusbankid != null and vo.cusbankid != '' ">
+                and b.cusbankid = #{vo.cusbankid}
+            </if>
+            <if test="vo.userid !=null and vo.userid != '' ">
+                and ta.userid = #{vo.userid}
+            </if>
+            <if test="vo.loginid !=null and vo.loginid != '' ">
+                and ta.userid in (select la.userid from loginaccount la where la.loginid = #{vo.loginid} )
+            </if>
+            <if test="vo.cardtype !=null and vo.cardtype != '' ">
+                and b.cardtype = #{vo.cardtype}
+            </if>
+            <if test="vo.startdate != null and vo.startdate != ''">
+                <![CDATA[and b.createtime >= to_date(#{vo.startdate}, 'yyyy-mm-dd hh24:mi:ss')]]>
+            </if>
+            <if test="  vo.enddate != null and vo.enddate != ''">
+                <![CDATA[and b.createtime <= to_date(#{vo.enddate}, 'yyyy-mm-dd hh24:mi:ss')]]>
+            </if>
+
+        </where>
+        order by b.CREATETIME desc
+    </select>
+
+</mapper>

mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/IBankAccountsignlogMapper.java

@@ -0,0 +1,26 @@
+package com.muchinfo.mtp3interface.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.muchinfo.mtp3pojos.entity.BankAccountsignlog;
+import com.muchinfo.mtp3pojos.vo.bankbusiness.BankAccountSignLogQueryParam;
+import com.muchinfo.mtp3pojos.vo.bankbusiness.BankAccountSignLogQueryResult;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 账户签解约申请流水表 - 导历史 Mapper 接口
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-06-03
+ */
+public interface IBankAccountsignlogMapper extends BaseMapper<BankAccountsignlog> {
+
+    IPage<BankAccountSignLogQueryResult> signLogQuery(IPage<BankAccountSignLogQueryResult> page,@Param("vo") BankAccountSignLogQueryParam param);
+
+    List<BankAccountSignLogQueryResult> signLogQuery( @Param("vo") BankAccountSignLogQueryParam param);
+
+}

mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/IHybridBankinfoMapper.java

@@ -0,0 +1,16 @@
+package com.muchinfo.mtp3interface.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muchinfo.mtp3pojos.entity.HybridBankinfo;
+
+/**
+ * <p>
+ * 混合支付银行信息表 Mapper 接口
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-06-04
+ */
+public interface IHybridBankinfoMapper extends BaseMapper<HybridBankinfo> {
+
+}

mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/IHybridChannelConfigMapper.java

@@ -0,0 +1,16 @@
+package com.muchinfo.mtp3interface.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muchinfo.mtp3pojos.entity.HybridChannelConfig;
+
+/**
+ * <p>
+ * 混合支付渠道配置表 Mapper 接口
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-06-04
+ */
+public interface IHybridChannelConfigMapper extends BaseMapper<HybridChannelConfig> {
+
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/BankAccountsignlog.java

@@ -0,0 +1,152 @@
+package com.muchinfo.mtp3pojos.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 账户签解约申请流水表 - 导历史
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-06-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("BANK_ACCOUNTSIGNLOG")
+@ApiModel(value="BankAccountsignlog对象", description="账户签解约申请流水表 - 导历史")
+public class BankAccountsignlog extends Model<BankAccountsignlog> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "流水号")
+    private Long exchticket;
+
+    @ApiModelProperty(value = "方向(可以判断那方先发起的签约) 1:交易服务 2:清算中心 3:账户服务")
+    @TableField("DIRECT")
+    private Integer direct;
+
+    @ApiModelProperty(value = "资金账号")
+    @TableField("ACCOUNTCODE")
+    private String accountcode;
+
+    @ApiModelProperty(value = "托管银行编号")
+    @TableField("CUSBANKID")
+    private String cusbankid;
+
+    @ApiModelProperty(value = "签约类型 - 1:签约 2:修改 4-绑卡; 5-解绑; 6-换卡 7:解约 8:换签")
+    @TableField("SIGNTYPE")
+    private Integer signtype;
+
+    @ApiModelProperty(value = "是否强制 - 0:非强制  1:强制")
+    @TableField("ISFORCE")
+    private Integer isforce;
+
+    @ApiModelProperty(value = "处理状态 - 1:待审核 2:待处理 3:审核成功 4:处理失败 5:审核拒绝")
+    @TableField("DEALSTATUS")
+    private Integer dealstatus;
+
+    @ApiModelProperty(value = "币种")
+    @TableField("CURRENCY")
+    private String currency;
+
+    @ApiModelProperty(value = "账户类型")
+    @TableField("ACCOUNTTYPE")
+    private Integer accounttype;
+
+    @ApiModelProperty(value = "资金账号对应的账号名称")
+    @TableField("ACCOUNTNAME")
+    private String accountname;
+
+    @ApiModelProperty(value = "银行卡类型")
+    @TableField("BANKCARDTYPE")
+    private Integer bankcardtype;
+
+    @ApiModelProperty(value = "银行卡号")
+    @TableField("BANKACCOUNTNO")
+    private String bankaccountno;
+
+    @ApiModelProperty(value = "银行账户类型 - 1-对私; 2-对公")
+    @TableField("BANKACCOUNTTYPE")
+    private Integer bankaccounttype;
+
+    @ApiModelProperty(value = "银行子账号（签约成功后，很多银行会返回对应的这个虚拟账号）")
+    @TableField("BANKCHILDACCOUNT")
+    private String bankchildaccount;
+
+    @ApiModelProperty(value = "签约银行ID")
+    @TableField("BANKID")
+    private String bankid;
+
+    @ApiModelProperty(value = "签约银行支行号")
+    @TableField("BRANCHBANKID")
+    private String branchbankid;
+
+    @ApiModelProperty(value = "签约银行支行名称")
+    @TableField("BRANCHBANKNAME")
+    private String branchbankname;
+
+    @ApiModelProperty(value = "签约银行卡账号名")
+    @TableField("BANKACCOUNTNAME")
+    private String bankaccountname;
+
+    @ApiModelProperty(value = "证件类型")
+    @TableField("CARDTYPE")
+    private String cardtype;
+
+    @ApiModelProperty(value = "证件号码")
+    @TableField("CARDNO")
+    private String cardno;
+
+    @ApiModelProperty(value = "开户行省份")
+    @TableField("BANKPROVINCE")
+    private String bankprovince;
+
+    @ApiModelProperty(value = "开户行城市")
+    @TableField("BANKCITY")
+    private String bankcity;
+
+    @ApiModelProperty(value = "手机号")
+    @TableField("MOBILEPHONE")
+    private String mobilephone;
+
+    @ApiModelProperty(value = "扩展信息(JSON字符串)")
+    @TableField("EXTENDINFO")
+    private String extendinfo;
+
+    @ApiModelProperty(value = "申请时间")
+    @TableField("CREATETIME")
+    private Date createtime;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("REMARK")
+    private String remark;
+
+    @ApiModelProperty(value = "调转网址")
+    @TableField("NETADDR")
+    private String netaddr;
+
+    @ApiModelProperty(value = "换签操作金额")
+    @TableField("CHANGEAMOUNT")
+    private BigDecimal changeamount;
+
+
+    @Override
+    public Serializable pkVal() {
+        return this.exchticket;
+    }
+
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/HybridBankinfo.java

@@ -0,0 +1,66 @@
+package com.muchinfo.mtp3pojos.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 混合支付银行信息表
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-06-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("HYBRID_BANKINFO")
+@ApiModel(value="HybridBankinfo对象", description="混合支付银行信息表")
+public class HybridBankinfo extends Model<HybridBankinfo> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "银行代码")
+    private String bankCode;
+
+    @ApiModelProperty(value = "银行名称")
+    @TableField("BANK_NAME")
+    private String bankName;
+
+    @ApiModelProperty(value = "渠道代码")
+    @TableField("CHANNEL_CODE")
+    private String channelCode;
+
+    @ApiModelProperty(value = "出入金标志 0-出金 1-入金")
+    @TableField("OUT_IN_FLAG")
+    private Integer outInFlag;
+
+    @ApiModelProperty(value = "方式类型")
+    @TableField("METHOD_TYPE")
+    private String methodType;
+
+    @ApiModelProperty(value = "是否可用 0-未可用 1-可用")
+    @TableField("IS_ENABLED")
+    private Integer isEnabled;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("REMARK")
+    private String remark;
+
+
+    @Override
+    public Serializable pkVal() {
+        return this.bankCode;
+    }
+
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/HybridChannelConfig.java

@@ -0,0 +1,54 @@
+package com.muchinfo.mtp3pojos.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 混合支付渠道配置表
+ * </p>
+ *
+ * @author XKF
+ * @since 2025-06-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("HYBRID_CHANNEL_CONFIG")
+@ApiModel(value="HybridChannelConfig对象", description="混合支付渠道配置表")
+public class HybridChannelConfig extends Model<HybridChannelConfig> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "渠道代码")
+    private String channelCode;
+
+    @ApiModelProperty(value = "渠道名称")
+    @TableField("CHANNEL_NAME")
+    private String channelName;
+
+    @ApiModelProperty(value = "入金是否可用 0-不可用 1-可用")
+    @TableField("CAN_AMT_IN")
+    private Integer canAmtIn;
+
+    @ApiModelProperty(value = "出金是否可用 0-不可用 1-可用")
+    @TableField("CAN_AMT_OUT")
+    private Integer canAmtOut;
+
+
+    @Override
+    public Serializable pkVal() {
+        return this.channelCode;
+    }
+
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/exportconverter/businessCodeNameConverter.java → mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/exportconverter/BusinessCodeNameConverter.java

@@ -7,7 +7,7 @@ import com.alibaba.excel.metadata.data.ReadCellData;
 import com.alibaba.excel.metadata.data.WriteCellData;
 import com.alibaba.excel.metadata.property.ExcelContentProperty;
 
-public class businessCodeNameConverter  implements Converter<Integer> {
+public class BusinessCodeNameConverter implements Converter<Integer> {
 
     private static final String TYPE_1 = "入金";
     private static final String TYPE_2 = "入金手续费";

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/bankbusiness/BankAccountSignLogQueryParam.java

@@ -41,6 +41,8 @@ public class BankAccountSignLogQueryParam {
     @ApiModelProperty(value = "结束时间")
     private String enddate;
 
+    private String usertypes;
+
     private Integer pageNum;
 
     private Integer pageSize;

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/bankbusiness/BankAccountSignLogQueryResult.java

@@ -1,11 +1,16 @@
 package com.muchinfo.mtp3pojos.vo.bankbusiness;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -13,5 +18,71 @@ import lombok.NoArgsConstructor;
 @ApiModel(value = "BankAccountSignLogQueryResult对象", description = "签解约查询")
 public class BankAccountSignLogQueryResult {
 
-    private Integer userid;
+    @ExcelProperty("登录账户")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "登录账户")
+    private Long loginids;
+
+    @ExcelProperty("资金账户")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "资金账户")
+    private Long accountcode;
+
+    @ExcelProperty("客户名称")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "客户名称")
+    private String accountname;
+
+    @ExcelProperty("托管银行")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "托管银行")
+    private String cusbankname;
+
+    @ExcelProperty("银行卡号")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "银行卡号")
+    private String bankaccountno;
+
+    @ExcelProperty("银行卡开户户名")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "银行卡开户户名")
+    private String bankaccountname;
+
+    @ExcelProperty("银行卡开户行")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "银行卡开户行")
+    private String bankname;
+
+    @ExcelProperty("证件类型")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "证件类型")
+    private Integer cardtype;
+
+    @ExcelProperty("证件号码")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "证件号码")
+    private String cardno;
+
+    @ExcelProperty("币种")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "币种")
+    private String currency;
+
+    @ExcelProperty("签解约类型")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "签解约类型")
+    private Integer signtype;
+
+    @ExcelProperty("申请时间")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "申请时间")
+    private Date createtime;
+
+    @ExcelProperty("处理状态")
+    @ColumnWidth(20)
+    @ApiModelProperty(value = "处理状态")
+    private Integer dealstatus;
+
+    private Long exchticket;
+
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/bankbusiness/BankChannleBankParam.java

@@ -0,0 +1,25 @@
+package com.muchinfo.mtp3pojos.vo.bankbusiness;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel(value = "BankChannleBankParam对象", description = "出入金银行流水")
+public class BankChannleBankParam {
+
+    private String channelCode;
+
+    private Integer outInFlag;
+
+    private String bankCodeName;
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/bankbusiness/BankMixBankUpdateParam.java

@@ -0,0 +1,28 @@
+package com.muchinfo.mtp3pojos.vo.bankbusiness;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel(value = "BankMixBankUpdateParam对象", description = "出入金银行配置")
+public class BankMixBankUpdateParam {
+
+    @ApiModelProperty(value = "渠道代码")
+    private String channelCode;
+
+    @ApiModelProperty(value = "渠道名称")
+    private String channelName;
+
+    @ApiModelProperty(value = "入金是否启用")
+    private Integer canAmtIn;
+
+    @ApiModelProperty(value = "出金是否启用")
+    private Integer canAmtOut;
+}