平台账户管理 账户管理 账单管理 :缴费,提现,转账

tianhu-system/src/main/java/com/tianhu/system/controller/AdminAccInfController.java

@@ -0,0 +1,92 @@
+package com.tianhu.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.keao.tianhu.starter.mybatis.plus.controller.BaseController;
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+import com.tianhu.common.core.domain.R;
+import com.tianhu.common.core.utils.CommonUtil;
+import com.tianhu.common.core.utils.DateUtils;
+import com.tianhu.common.core.utils.IdUtils;
+import com.tianhu.common.core.web.domain.AjaxResult;
+import com.tianhu.common.log.annotation.Log;
+import com.tianhu.common.log.enums.BusinessType;
+import com.tianhu.common.security.annotation.PreAuthorize;
+import com.tianhu.common.security.service.TokenService;
+import com.tianhu.system.api.domain.SysUser;
+import com.tianhu.system.api.model.LoginUser;
+import com.tianhu.system.domain.PayAccInf;
+import com.tianhu.system.domain.SysCompany;
+import com.tianhu.system.domain.ZcCfcaBankInf;
+import com.tianhu.system.service.IPayAccInfService;
+import com.tianhu.system.service.ISysCompanyService;
+import com.tianhu.system.service.IZcCfcaBankInfService;
+import com.tianhu.system.service.OwnAdminAccInfService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * ClassName: AdminAccInfController平台虚拟账户管理<br>
+ * Description: PayAccInf Controller <br>
+ * Company: keao
+ *
+ * @author peixh
+ * @version v1.0.0    2021-10-18  peixh    由Generator自动创建
+ */
+@Slf4j
+@RestController
+@RequestMapping("/adminAccInf")
+public class AdminAccInfController extends BaseController {
+
+    @Autowired
+    private IPayAccInfService payAccInfService;
+
+    @Autowired
+    private TokenService tokenService;
+    @Autowired
+    private OwnAdminAccInfService ownAdminAccInfService;
+
+    /**
+     * 列表查询
+     * @param request
+     * @return
+     */
+    @PreAuthorize(hasPermi = "admin:accInf:list")
+    @GetMapping("list")
+    public R list(QueryRequest request) {
+        //获取当前操作人员
+        LoginUser userInfo = tokenService.getLoginUser();
+        SysUser use = userInfo.getSysUser();
+        LambdaQueryWrapper<PayAccInf> payAccInf = new LambdaQueryWrapper();
+        //企业ID
+        payAccInf.eq(PayAccInf::getPaiCstno,use.getCompanyId());
+        //账户状态(0:未开通，1：冻结,2已开通3:待激活)
+        payAccInf.eq(PayAccInf::getPaiStatus,"2");
+        //账户类型(00基本账户01一般账户02信用账户03手续费账户04待结算账户05提现账户06虚拟账户07:公共计息账户08:资金初始化账户09:公共调账账户)
+        payAccInf.eq(PayAccInf::getPaiAcctype,"06");
+        IPage<PayAccInf> sccInf = payAccInfService.findPayAccInfs(request, payAccInf);
+        return R.ok(sccInf);
+    }
+
+    /**
+     * 查询法人信息
+     * @return
+     */
+    @GetMapping("listCorporation")
+    public R listCorporation() {
+        //获取当前操作人员
+        LoginUser userInfo = tokenService.getLoginUser();
+        SysUser use = userInfo.getSysUser();
+        String companyId = use.getCompanyId();
+        Map map = new HashMap();
+        map.put("companyId",companyId);
+        List<Map> list = ownAdminAccInfService.selectAdminInfList(map);
+        return R.ok(list);
+    }
+}

tianhu-system/src/main/java/com/tianhu/system/controller/MessageController.java

@@ -10,11 +10,17 @@ import com.tianhu.common.core.web.domain.AjaxResult;
 import com.tianhu.common.log.annotation.Log;
 import com.tianhu.common.log.enums.BusinessType;
 import com.tianhu.common.redis.common.RedisUtils;
+import com.tianhu.common.security.service.TokenService;
+import com.tianhu.system.api.domain.SysUser;
+import com.tianhu.system.api.model.LoginUser;
 import com.tianhu.system.common.IMessageUtilsService;
 import com.tianhu.system.common.ValidateCodeService;
 import com.tianhu.system.domain.PubVerifyCode;
+import com.tianhu.system.domain.SysUserCompanyRel;
 import com.tianhu.system.service.IPubVerifyCodeService;
 import com.tianhu.system.service.ISysDictDataService;
+import com.tianhu.system.service.ISysUserCompanyRelService;
+import com.tianhu.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -46,6 +52,12 @@ public class MessageController extends BaseController
     private ValidateCodeService validateCodeService;
     @Autowired
     private IPubVerifyCodeService iPubVerifyCodeService;
+    @Autowired
+    private TokenService tokenService;
+    @Autowired
+    private ISysUserCompanyRelService iSysUserCompanyRelService;
+    @Autowired
+    private ISysUserService iSysUserService;
 
     /**
      *
@@ -114,4 +126,81 @@ public class MessageController extends BaseController
         iMessageUtilsService.sendMessageCode(requestBody.get("phone"), "zhuce", param, random);
         return AjaxResult.success();
     }
+
+
+    /**
+     * 提现发送短信验证码
+     * @param
+     * @return
+     * @throws Exception
+     */
+    @Transactional(rollbackFor=Exception.class)
+    @PostMapping("/sendMessageForMoney")
+    public AjaxResult sendMessageForMoney() throws Exception {
+        List<Map<String,String>> resultList = new ArrayList<>();
+        //获取此操作员
+        LoginUser userInfo = tokenService.getLoginUser();
+        SysUser user = userInfo.getSysUser();
+        String companyId = user.getCompanyId();
+        //查询经办人手机号
+        LambdaQueryWrapper<SysUserCompanyRel> wrapper = new LambdaQueryWrapper<>();
+        //企业id
+        wrapper.eq(SysUserCompanyRel::getSucrCompanyId,companyId);
+        //是否经办人 0:不是, 1:是
+        wrapper.eq(SysUserCompanyRel::getSucrHandler,"1");
+        List<SysUserCompanyRel> userCompanyList = iSysUserCompanyRelService.findSysUserCompanyRels(wrapper);
+        //手机号
+        String phone = "";
+        if(userCompanyList.size() > 0){
+            Long userId = userCompanyList.get(0).getSucrUserId();
+            SysUser sysUser = iSysUserService.selectUserById(userId);
+            phone = sysUser.getUserName();
+        } else if (userCompanyList.size() <= 0){
+            throw new Exception("系统错误，请联系平台管理员");
+        }
+        //查询五分钟之内发送验证码的次数
+        LambdaQueryWrapper<PubVerifyCode> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(PubVerifyCode::getPvcPhone,phone);
+        List<PubVerifyCode> list = iPubVerifyCodeService.findPubVerifyCodes(queryWrapper);
+        //获取时间差
+        for (PubVerifyCode pubVerifyCode : list){
+            //最后发送时间
+            Date date = pubVerifyCode.getPvcLastTime();
+            Instant instantDate = date.toInstant();
+            ZoneId zoneIdDate = ZoneId.systemDefault();
+            LocalDateTime localDate = instantDate.atZone(zoneIdDate).toLocalDateTime();
+            //当前时间
+            Date time = DateUtils.getNowDate();
+            Instant instantTime = time.toInstant();
+            ZoneId zoneIdTime = ZoneId.systemDefault();
+            LocalDateTime localTime = instantTime.atZone(zoneIdTime).toLocalDateTime();
+            //算出时间差
+            Duration differenceValue = Duration.between(localDate, localTime);
+            Long seconds = differenceValue.getSeconds();
+            BigInteger cond = BigInteger.valueOf(seconds);
+            BigInteger big = BigInteger.valueOf(Long.valueOf("60"));
+            BigInteger ans = cond.divide(big);
+            String rence = String.valueOf(ans);
+            //时间差
+            BigDecimal bigDecimal = new BigDecimal(rence);
+            BigDecimal tow = new BigDecimal("5");
+            if(tow.compareTo(bigDecimal) > -1){
+                Map map = new HashMap();
+                map.put("diffrence", "五分钟之内存在");
+                resultList.add(map);
+            }
+        }
+        if(resultList.size() > 3){
+            throw new Exception("服务器繁忙，请半小时后再获取验证码");
+        }
+        //validateCodeService.checkCapcha(requestBody.get("imgCode"), requestBody.get("uuid"), false);
+        String random = iMessageUtilsService.genRandomNum(6);
+        Map<String, String> param = new HashMap<>();
+        param.put("code", random);
+        // 获取注册模板ID
+//        String templateCode = RedisUtils.getDictValue("aliyun_message_code", "zhuce");
+//        String templateCode = dictDataService.selectDictValue("aliyun_message_code", "zhuce");
+        iMessageUtilsService.sendMessageCode(phone, "zhuce", param, random);
+        return AjaxResult.success();
+    }
 }

tianhu-system/src/main/java/com/tianhu/system/controller/PayAccDetailController.java

@@ -0,0 +1,96 @@
+package com.tianhu.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.keao.tianhu.starter.mybatis.plus.controller.BaseController;
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+import com.tianhu.common.core.domain.R;
+import com.tianhu.common.core.utils.CommonUtil;
+import com.tianhu.common.core.utils.DateUtils;
+import com.tianhu.common.core.utils.IdUtils;
+import com.tianhu.common.core.web.domain.AjaxResult;
+import com.tianhu.common.log.annotation.Log;
+import com.tianhu.common.log.enums.BusinessType;
+import com.tianhu.common.security.annotation.PreAuthorize;
+import com.tianhu.common.security.service.TokenService;
+import com.tianhu.system.api.domain.SysUser;
+import com.tianhu.system.api.model.LoginUser;
+import com.tianhu.system.domain.PayAccDetail;
+import com.tianhu.system.domain.PayAccInf;
+import com.tianhu.system.domain.SysCompany;
+import com.tianhu.system.domain.ZcCfcaBankInf;
+import com.tianhu.system.service.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * ClassName: PayAccDetailController账户管理<br>
+ * Description: PayAccDetail Controller <br>
+ * Company: keao
+ *
+ * @author peixh
+ * @version v1.0.0    2021-10-18  peixh    由Generator自动创建
+ */
+@Slf4j
+@RestController
+@RequestMapping("/payAccDetail")
+public class PayAccDetailController extends BaseController {
+
+    @Autowired
+    private IPayAccInfService payAccInfService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    @Autowired
+    private ISysCompanyService sysCompanyService;
+    @Autowired
+    private IOwnPayAccDetailService iOwnPayAccDetailService;
+    @Autowired
+    private IPayAccDetailService iPayAccDetailService;
+
+    @PreAuthorize(hasPermi = "acc:detail:list")
+    @GetMapping("list")
+    public R list(//企业名称
+                  String scyName,
+                  //银行名称
+                  String paiBankName,
+                  //客户流水号
+                  String padPayflowno,
+                  //状态
+                  String padState,QueryRequest request) {
+        //获取当前操作人员
+        LoginUser userInfo = tokenService.getLoginUser();
+        SysUser use = userInfo.getSysUser();
+        String companyId = use.getCompanyId();
+        Map map = new HashMap();
+        //企业名称
+        map.put("scyName",scyName);
+        //银行名称
+        map.put("paiBankName",paiBankName);
+        //客户流水号
+        map.put("padPayflowno",padPayflowno);
+        //状态
+        map.put("padState",padState);
+        IPage<Map> list = iOwnPayAccDetailService.selectAccDetailList(map,request);
+        return R.ok(list);
+    }
+    /**
+     * 查询企业详情
+     */
+    @PreAuthorize(hasPermi = "acc:detail:query")
+    @GetMapping(value = "/{padNo}")
+    public AjaxResult details(@PathVariable("padNo") String padNo)throws Exception {
+        //获取当前操作人员
+        LoginUser userInfo = tokenService.getLoginUser();
+        SysUser use = userInfo.getSysUser();
+        PayAccDetail payAccDetail = iPayAccDetailService.getById(padNo);
+        return AjaxResult.success(payAccDetail);
+    }
+
+}

tianhu-system/src/main/java/com/tianhu/system/controller/PayAccInfController.java

@@ -6,6 +6,7 @@ import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
 import com.keao.tianhu.core.exception.base.BusinessException;
 import com.tianhu.common.core.domain.R;
 import com.tianhu.common.core.utils.CommonUtil;
+import com.tianhu.common.core.utils.DateUtils;
 import com.tianhu.common.core.utils.IdUtils;
 import com.tianhu.common.core.web.domain.AjaxResult;
 import com.tianhu.common.core.web.page.TableDataInfo;
@@ -59,6 +60,7 @@ public class PayAccInfController extends BaseController {
     @Autowired
     private ISysCompanyService sysCompanyService;
 
+    @PreAuthorize(hasPermi = "accInf:accInf:list")
     @GetMapping("list")
     public R list(String paiAccno,QueryRequest request) {
         //获取当前操作人员
@@ -148,6 +150,8 @@ public class PayAccInfController extends BaseController {
         payAccInf1.setPaiQlbankname(paiQlbankname);
         payAccInf1.setPaiAccnoName(paiAccnoName);
         payAccInf1.setPaiBankName(paiBankName);
+        payAccInf1.setCreateBy(use.getUserId()+"");
+        payAccInf1.setCreateTime(DateUtils.getNowDate());
         payAccInfService.createPayAccInf(payAccInf1);
         return R.ok();
     }
@@ -195,6 +199,8 @@ public class PayAccInfController extends BaseController {
         payAccInf1.setPaiQlbankname(paiQlbankname);
         payAccInf1.setPaiAccnoName(paiAccnoName);
         payAccInf1.setPaiBankName(paiBankName);
+        payAccInf1.setUpdateBy(use.getUserId()+"");
+        payAccInf1.setUpdateTime(DateUtils.getNowDate());
         payAccInfService.updatePayAccInf(payAccInf1);
         return R.ok();
     }
@@ -212,8 +218,8 @@ public class PayAccInfController extends BaseController {
         PayAccInf payAccInf1 =new PayAccInf();
         payAccInf1.setPaiId(paiId);
         payAccInf1.setPaiStatus("1");
-        payAccInf1.setCreateBy(use.getUserId()+"");
-        payAccInf1.setCreateTime(new Date());
+        payAccInf1.setUpdateBy(use.getUserId()+"");
+        payAccInf1.setUpdateTime(DateUtils.getNowDate());
         payAccInfService.updatePayAccInf(payAccInf1);
         return R.ok();
     }
@@ -224,12 +230,12 @@ public class PayAccInfController extends BaseController {
      * @return
      */
     @PostMapping("/queryBank")
-    public R queryBank(String pbaiBankName,QueryRequest request) throws Exception {
+    public R queryBank(String paiBankName,QueryRequest request) throws Exception {
         //查询账户
         LambdaQueryWrapper<ZcCfcaBankInf> bank = new LambdaQueryWrapper<>();
         //所属银行
-        if(CommonUtil.isNotEmpty(pbaiBankName)){
-            bank.like(ZcCfcaBankInf::getZcbiBankName,pbaiBankName);
+        if(CommonUtil.isNotEmpty(paiBankName)){
+            bank.like(ZcCfcaBankInf::getZcbiBankName,paiBankName);
         }
         IPage<ZcCfcaBankInf> bankAcc = zcCfcaBankInfService.findZcCfcaBankInfs(request, bank);
         return R.ok(bankAcc);
@@ -248,9 +254,9 @@ public class PayAccInfController extends BaseController {
         //企业
         accInf.eq(PayAccInf::getPaiCstno,use.getCompanyId());
         //账户状态(0:未开通，1：冻结,2已开通3:待激活)
-        accInf.eq(PayAccInf::getPaiStatus,"02");
+        accInf.eq(PayAccInf::getPaiStatus,"2");
         //账户类型(00基本账户01贷款账户02信用账户03手续费账户04待结算账户05提现账户06虚拟账户)
-        accInf.in(PayAccInf::getPaiAccnoName,"00,01");
+        accInf.in(PayAccInf::getPaiAcctype,"00","01");
         IPage<PayAccInf> bankAcc = payAccInfService.findPayAccInfs(request, accInf);
         return R.ok(bankAcc);
     }

tianhu-system/src/main/java/com/tianhu/system/controller/UserWthdrawalController.java

@@ -0,0 +1,237 @@
+package com.tianhu.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.keao.tianhu.starter.mybatis.plus.controller.BaseController;
+import com.tianhu.common.core.domain.R;
+import com.tianhu.common.core.utils.CommonUtil;
+import com.tianhu.common.core.utils.DateUtils;
+import com.tianhu.common.core.web.domain.AjaxResult;
+import com.tianhu.common.security.annotation.PreAuthorize;
+import com.tianhu.common.security.service.TokenService;
+import com.tianhu.system.api.RemoteZxBankService;
+import com.tianhu.system.api.domain.SysUser;
+import com.tianhu.system.api.model.LoginUser;
+import com.tianhu.system.domain.PayAccInf;
+import com.tianhu.system.domain.PubVerifyCode;
+import com.tianhu.system.domain.SysUserCompanyRel;
+import com.tianhu.system.domain.ZcChargeInf;
+import com.tianhu.system.service.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * ClassName: UserWthdrawalController提现<br>
+ * Description:  Controller <br>
+ * Company: keao
+ *
+ * @author peixh
+ * @version v1.0.0    2021-10-19  peixh    由Generator自动创建
+ */
+@Slf4j
+@RestController
+@RequestMapping("/userWthdrawal")
+public class UserWthdrawalController extends BaseController {
+
+    @Autowired
+    private IPayAccInfService payAccInfService;
+
+    @Autowired
+    private TokenService tokenService;
+    @Autowired
+    private ISysUserCompanyRelService iSysUserCompanyRelService;
+    @Autowired
+    private ISysUserService iSysUserService;
+    @Autowired
+    private IPubVerifyCodeService iPubVerifyCodeService;
+    @Autowired
+    private OwnUserWthdrawalService ownUserWthdrawalService;
+    @Autowired
+    private RemoteZxBankService remoteZxBankService;
+    @Autowired
+    private IPayAccInfService iPayAccInfService;
+    @Autowired
+    private IZcChargeInfService iZcChargeInfService;
+
+    @PreAuthorize(hasPermi = "user:wthdrawal:add")
+    @PostMapping("wthdrawal")
+    public R wthdrawal(@RequestBody Map map) {
+        //验证码
+        String shortMessageCode = CommonUtil.objToString(map.get("shortMessageCode"));
+        //实体账户
+        String stAccNo = CommonUtil.objToString(map.get("stAccNo"));
+        //电子账户
+        String dzAccNo = CommonUtil.objToString(map.get("dzAccNo"));
+        //提现金额
+        String tranAmt = CommonUtil.objToString(map.get("tranAmt"));
+        //获取当前操作人员
+        LoginUser userInfo = tokenService.getLoginUser();
+        SysUser user = userInfo.getSysUser();
+        String companyId = user.getCompanyId();
+        //查询经办人手机号
+        LambdaQueryWrapper<SysUserCompanyRel> wrapper = new LambdaQueryWrapper<>();
+        //企业id
+        wrapper.eq(SysUserCompanyRel::getSucrCompanyId,companyId);
+        //是否经办人 0:不是, 1:是
+        wrapper.eq(SysUserCompanyRel::getSucrHandler,"1");
+        List<SysUserCompanyRel> userCompanyList = iSysUserCompanyRelService.findSysUserCompanyRels(wrapper);
+        //手机号
+        Long userId = userCompanyList.get(0).getSucrUserId();
+        SysUser sysUser = iSysUserService.selectUserById(userId);
+        String phone = sysUser.getUserName();
+        // 验证短信验证码
+        if(CommonUtil.isNotEmpty(shortMessageCode)){
+            LambdaQueryWrapper<PubVerifyCode> pubVerifyCode = new LambdaQueryWrapper<>();
+            pubVerifyCode.eq(PubVerifyCode::getPvcPhone,phone);
+            pubVerifyCode.eq(PubVerifyCode::getPvcCode,shortMessageCode);
+            pubVerifyCode.orderByDesc(PubVerifyCode::getPvcLastTime);
+            List<PubVerifyCode> staffInf = iPubVerifyCodeService.findPubVerifyCodes(pubVerifyCode);
+            if(staffInf.size()>0){
+                if("01".equals(staffInf.get(0).getPvcState())){
+                    return R.fail("验证码已失效,请重新获取！");
+                }
+                //取得指定时间间隔后的系统时间
+                GregorianCalendar calendar = (GregorianCalendar) Calendar.getInstance();
+                calendar.add( Calendar.MINUTE, -5);
+                SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmmss");
+                if(formatter.format(calendar.getTime()).compareTo(formatter.format(staffInf.get(0).getPvcLastTime()))>0){
+                    return R.fail("验证码已失效,请重新获取！");
+                }
+
+                staffInf.get(0).setPvcState("01");
+                iPubVerifyCodeService.updatePubVerifyCode(staffInf.get(0));
+                remoteZxBankService.withdrawalInterface(stAccNo,tranAmt);
+            }else{
+                return R.fail("验证码错误，请重新输入！");
+            }
+        }else{
+            return R.fail("请填写验证码");
+        }
+        return R.ok();
+    }
+
+    /**
+     * 查询费用状态
+     * @param accNo 电子账户
+     * @return
+     */
+    @GetMapping("/listChargeStatus/{accNo}")
+    public AjaxResult listChargeStatus(@PathVariable("accNo") String accNo){
+        //获取此操作员
+        LoginUser userInfo = tokenService.getLoginUser();
+        SysUser user = userInfo.getSysUser();
+        String companyId = user.getCompanyId();
+        Map map = new HashMap();
+        //企业id
+        map.put("companyId",companyId);
+        //电子账户
+        map.put("accNo",accNo);
+        List<Map> list = ownUserWthdrawalService.selectChargeInfList(map);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 转账(缴纳手续费)
+     * @param map
+     * @return
+     */
+    @PostMapping("payMoney")
+    public R payMoney(@RequestBody Map<String, Object> map) {
+        //获取此操作员
+        LoginUser userInfo = tokenService.getLoginUser();
+        SysUser user = userInfo.getSysUser();
+        String userId = user.getUserId()+"";
+        String companyId = user.getCompanyId();
+        String accNo = map.get("accNo")+"";
+        Map maps = new HashMap();
+        //企业id
+        maps.put("companyId",companyId);
+        //电子账户
+        maps.put("accNo",accNo);
+        List<Map> list = ownUserWthdrawalService.selectChargeInfList(map);
+        //--------------------查询本公司电子账户
+        LambdaQueryWrapper<PayAccInf> queryWrapper = new LambdaQueryWrapper<>();
+        //企业id
+        queryWrapper.eq(PayAccInf::getPaiCstno,companyId);
+        //账户类型(00基本账户01贷款账户02信用账户03手续费账户04待结算账户05提现账户06虚拟账户)
+        queryWrapper.eq(PayAccInf::getPaiAcctype,"06");
+        //开户行号(1000:中信银行)
+        queryWrapper.eq(PayAccInf::getPaiQlbankno,"302");
+        //账户状态(0:未开通，1：冻结,2已开通3:待激活)
+        queryWrapper.eq(PayAccInf::getPaiStatus,"2");
+        List<PayAccInf> accInfList = iPayAccInfService.findPayAccInfs(queryWrapper);
+        //账号
+        String paiAccNo = "";
+        //账户名称
+        String paiAccnoName = "";
+        if (accInfList.size() > 0){
+            paiAccNo = accInfList.get(0).getPaiAccno();
+            paiAccnoName = accInfList.get(0).getPaiAccnoName();
+        }
+        //--------------------查询平台公共计息账户
+        LambdaQueryWrapper<PayAccInf> wrapper = new LambdaQueryWrapper<>();
+        //企业id
+        wrapper.eq(PayAccInf::getPaiCstno,"000000");
+        //账户类型(00基本账户01贷款账户02信用账户03手续费账户04待结算账户05提现账户06虚拟账户)
+        wrapper.eq(PayAccInf::getPaiAcctype,"07");
+        //开户行号(1000:中信银行)
+        wrapper.eq(PayAccInf::getPaiQlbankno,"302");
+        //账户状态(0:未开通，1：冻结,2已开通3:待激活)
+        wrapper.eq(PayAccInf::getPaiStatus,"2");
+        List<PayAccInf> accList = iPayAccInfService.findPayAccInfs(wrapper);
+        //账号
+        String accountNo = "";
+        //开户行名
+        String accnoName = "";
+        if (accList.size() > 0){
+            accountNo = accList.get(0).getPaiAccno();
+            accnoName = accList.get(0).getPaiAccnoName();
+        }
+        List<Map> result = new ArrayList<>();
+        for (int i = 0; i < list.size(); i++) {
+            //费用主键
+            String zciId = list.get(i).get("zciId")+"";
+            //手续费
+            String zciAmount = list.get(i).get("zciAmount")+"";
+            //融资编号
+            String zfrNumber = list.get(i).get("zfrNumber")+"";
+            R r = remoteZxBankService.transfer(paiAccNo,accountNo,accnoName,zciAmount,companyId,zciId,"10");
+            //数据信息
+            Map mapData = (Map) r.getData();
+            //状态是否存在
+            ZcChargeInf zcChargeInf = new ZcChargeInf();
+            zcChargeInf.setZciId(zciId);
+            if(mapData.containsKey("status")) {
+                //状态 0 交易中 1 成功 2  失败
+                String status = mapData.get("status").toString();
+                if (!"1".equals(status)){
+                    Map end = new HashMap();
+                    end.put("status",status);
+                    end.put("zfrNumber",zfrNumber);
+                    end.put("zciAmount",zciAmount);
+                    result.add(end);
+                }else if ("0".equals(status)){
+                    zcChargeInf.setZciStatus("01");
+                }else if ("1".equals(status)){
+                    zcChargeInf.setZciStatus("02");
+                }else if ("2".equals(status)){
+                    zcChargeInf.setZciStatus("05");
+                }
+                zcChargeInf.setUpdateBy(userId);
+                zcChargeInf.setUpdateTime(DateUtils.getNowDate());
+                iZcChargeInfService.updateZcChargeInf(zcChargeInf);
+            }else {
+                zcChargeInf.setZciStatus("05");
+                zcChargeInf.setUpdateBy(userId);
+                zcChargeInf.setUpdateTime(DateUtils.getNowDate());
+                iZcChargeInfService.updateZcChargeInf(zcChargeInf);
+                return R.fail("缴费失败");
+            }
+
+        }
+        return R.ok(result);
+    }
+}

tianhu-system/src/main/java/com/tianhu/system/domain/PayAccDetail.java

@@ -0,0 +1,155 @@
+package com.tianhu.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 账户历史信息表
+ * </p>
+ *
+ * @author pxh
+ * @since 2021-10-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("pay_acc_detail")
+public class PayAccDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 流水号
+     */
+    @TableId("PAD_NO")
+    private String padNo;
+
+    /**
+     * 企业ID(sys_company.scy_id)
+     */
+    @TableField("PAD_CSTNO")
+    private String padCstno;
+
+    /**
+     * 账号(pay_acc_inf.PAI_ACCNO)
+     */
+    @TableField("PAD_ACCNO")
+    private String padAccno;
+
+    /**
+     * 版本号
+     */
+    @TableField("PAD_VERSION")
+    private Integer padVersion;
+
+    /**
+     * 账户状态(0:正常，1：冻结)
+     */
+    @TableField("PAD_STATUS")
+    private String padStatus;
+
+    /**
+     * 余额
+     */
+    @TableField("PAD_BALANCE")
+    private String padBalance;
+
+    /**
+     * 可用余额
+     */
+    @TableField("PAD_AVABALANCE")
+    private String padAvabalance;
+
+    /**
+     * 账户类型(00基本账户01贷款账户02信用账户03手续费账户04待结算账户05提现账户)
+     */
+    @TableField("PAD_ACCTYPE")
+    private String padAcctype;
+
+    /**
+     * 币种(CNY)
+     */
+    @TableField("PAD_CRYTYPE")
+    private String padCrytype;
+
+    /**
+     * 发生额（+10 -10）
+     */
+    @TableField("PAD_TRXAMOUT")
+    private String padTrxamout;
+
+    /**
+     * 支付流水号
+     */
+    @TableField("PAD_PAYFLOWNO")
+    private String padPayflowno;
+
+    /**
+     * 00充值(CZ)、10支付(ZF)、20转账(ZZ)、30退款(TK)、31退款到银行卡、3A退卡、40预付卡充值、41消费、42消费撤销、43消费冲正、44消费撤销冲正、50:余额查询、60提现(TX)、70结算（JS） 、71银行结算、72:POS结算、73、批上送、80手续费pos、90个人调账、91卡调账、92:商户调账、93:pos终端调账、94:平台调账、95银行账户调账 、96提现失败 S0签到、S1签退
+     */
+    @TableField("PAD_TRANTYPE")
+    private String padTrantype;
+
+    /**
+     * 备注
+     */
+    @TableField("PAD_REMRK")
+    private String padRemrk;
+
+    /**
+     * 创建人
+     */
+    @TableField("create_by")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 修改人
+     */
+    @TableField("update_by")
+    private String updateBy;
+
+    /**
+     * 修改时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 状态（00：交易中 01：成功 02：失败）
+     */
+    @TableField("PAD_STATE")
+    private String padState;
+
+    /**
+     * 业务表主键
+     */
+    @TableField("pad_business_id")
+    private String padBusinessId;
+
+    /**
+     * 交易查询次数
+     */
+    @TableField("pad_tar_count")
+    private String padTarCount;
+
+    /**
+     * 转账查询次数
+     */
+    @TableField("pad_pay_count")
+    private String padPayCount;
+
+
+}

tianhu-system/src/main/java/com/tianhu/system/domain/ZcChargeInf.java

@@ -0,0 +1,144 @@
+package com.tianhu.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 融资费用表
+ * </p>
+ *
+ * @author xuefy
+ * @since 2021-08-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("zc_charge_inf")
+public class ZcChargeInf implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId("zci_id")
+    private String zciId;
+
+    /**
+     * 融资编号(zc_finance_record.zfr_id)
+     */
+    @TableField("zci_finance_id")
+    private String zciFinanceId;
+
+    /**
+     * 融资费用
+     */
+    @TableField("zci_amount")
+    private String zciAmount;
+
+    /**
+     * 状态
+     */
+    @TableField("zci_status")
+    private String zciStatus;
+
+    /**
+     * 发票状态
+     */
+    @TableField("zci_invoice_status")
+    private String zciInvoiceStatus;
+
+    /**
+     * 快递单号
+     */
+    @TableField("zci_express_no")
+    private String zciExpressNo;
+
+    /**
+     * 备用字段1
+     */
+    @TableField("zci_profit_spare1")
+    private String zciProfitSpare1;
+
+    /**
+     * 备用字段2
+     */
+    @TableField("zci_profit_spare2")
+    private String zciProfitSpare2;
+
+    /**
+     * 备用字段3
+     */
+    @TableField("zci_profit_spare3")
+    private String zciProfitSpare3;
+
+    /**
+     * 备用字段4
+     */
+    @TableField("zci_profit_spare4")
+    private String zciProfitSpare4;
+
+    /**
+     * 备用字段5
+     */
+    @TableField("zci_profit_spare5")
+    private String zciProfitSpare5;
+
+    /**
+     * 备用字段6
+     */
+    @TableField("zci_profit_spare6")
+    private String zciProfitSpare6;
+
+    /**
+     * 备用字段7
+     */
+    @TableField("zci_profit_spare7")
+    private String zciProfitSpare7;
+
+    /**
+     * 备用字段8
+     */
+    @TableField("zci_profit_spare8")
+    private String zciProfitSpare8;
+
+    /**
+     * 备用字段9
+     */
+    @TableField("zci_profit_spare9")
+    private String zciProfitSpare9;
+
+    /**
+     * 创建者
+     */
+    @TableField("create_by")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField("update_by")
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

tianhu-system/src/main/java/com/tianhu/system/mapper/OwnAdminAccInfMapper.java

@@ -0,0 +1,21 @@
+package com.tianhu.system.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface OwnAdminAccInfMapper {
+
+
+
+    /**
+     * 查询提现需缴费金额
+     * @param map
+     * @return
+     */
+    public List<Map> selectAdminInfList(@Param("paramMap") Map map);
+
+}

tianhu-system/src/main/java/com/tianhu/system/mapper/OwnPayAccDetailMapper.java

@@ -0,0 +1,28 @@
+package com.tianhu.system.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.mapstruct.Mapper;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 账户历史信息表 Mapper 接口
+ * </p>
+ *
+ * @author pxh
+ * @since 2021-10-18
+ */
+@Mapper
+public interface OwnPayAccDetailMapper{
+    /**
+     * 查询账户历史信息表
+     *
+     * @param
+     * @return 账户历史信息集合
+     */
+    public IPage<Map> selectAccDetailList(Page<Map> page, @Param("paramMap") Map map);
+
+}

tianhu-system/src/main/java/com/tianhu/system/mapper/OwnUserWthdrawalMapper.java

@@ -0,0 +1,23 @@
+package com.tianhu.system.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface OwnUserWthdrawalMapper {
+
+
+
+    /**
+     * 查询提现需缴费金额
+     * @param map
+     * @return
+     */
+    public List<Map> selectChargeInfList(@Param("paramMap") Map map);
+
+}

tianhu-system/src/main/java/com/tianhu/system/mapper/PayAccDetailMapper.java

@@ -0,0 +1,16 @@
+package com.tianhu.system.mapper;
+
+import com.tianhu.system.domain.PayAccDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 账户历史信息表 Mapper 接口
+ * </p>
+ *
+ * @author pxh
+ * @since 2021-10-18
+ */
+public interface PayAccDetailMapper extends BaseMapper<PayAccDetail> {
+
+}

tianhu-system/src/main/java/com/tianhu/system/mapper/ZcChargeInfMapper.java

@@ -0,0 +1,16 @@
+package com.tianhu.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.tianhu.system.domain.ZcChargeInf;
+
+/**
+ * <p>
+ * 融资费用表 Mapper 接口
+ * </p>
+ *
+ * @author xuefy
+ * @since 2021-08-16
+ */
+public interface ZcChargeInfMapper extends BaseMapper<ZcChargeInf> {
+
+}

tianhu-system/src/main/java/com/tianhu/system/service/IOwnPayAccDetailService.java

@@ -0,0 +1,21 @@
+package com.tianhu.system.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+
+import java.util.List;
+import java.util.Map;
+
+public interface IOwnPayAccDetailService {
+
+
+    /**
+     * 查询账户历史信息表
+     *
+     * @param
+     * @return 账户历史信息集合
+     */
+    public IPage<Map> selectAccDetailList(Map map, QueryRequest request);
+
+
+}

tianhu-system/src/main/java/com/tianhu/system/service/IPayAccDetailService.java

@@ -0,0 +1,60 @@
+package com.tianhu.system.service;
+
+import com.tianhu.system.domain.PayAccDetail;
+
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+
+
+import java.util.List;
+
+/**
+ * ClassName: IPayAccDetailService<br>
+ * Description: PayAccDetailService接口 <br>
+ * Company: keao
+ *
+ * @author pxh
+ * @version v1.0.0    2021-10-18  pxh    由Generator自动创建
+ */
+public interface IPayAccDetailService extends IService<PayAccDetail> {
+    /**
+     * 查询（分页）
+     *
+     * @param request QueryRequest
+     * @param wrapper LambdaQueryWrapper<PayAccDetail>
+     * @return IPage<PayAccDetail>
+     */
+    IPage<PayAccDetail> findPayAccDetails(QueryRequest request, LambdaQueryWrapper<PayAccDetail> wrapper);
+
+    /**
+     * 查询（所有）
+     *
+     * @param wrapper LambdaQueryWrapper<PayAccDetail>
+     * @return List<PayAccDetail>
+     */
+    List<PayAccDetail> findPayAccDetails(LambdaQueryWrapper<PayAccDetail> wrapper);
+
+    /**
+     * 新增
+     *
+     * @param payAccDetail payAccDetail
+     */
+    void createPayAccDetail(PayAccDetail payAccDetail);
+
+    /**
+     * 修改
+     *
+     * @param payAccDetail payAccDetail
+     */
+    void updatePayAccDetail(PayAccDetail payAccDetail);
+
+    /**
+     * 删除
+     *
+     * @param wrapper LambdaQueryWrapper<PayAccDetail>
+     */
+    void deletePayAccDetail(LambdaQueryWrapper<PayAccDetail> wrapper);
+}

tianhu-system/src/main/java/com/tianhu/system/service/IZcChargeInfService.java

@@ -0,0 +1,57 @@
+package com.tianhu.system.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.tianhu.system.domain.ZcChargeInf;
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+
+import java.util.List;
+
+/**
+ * ClassName: IZcChargeInfService<br>
+ * Description: ZcChargeInfService接口 <br>
+ * Company: keao
+ *
+ * @author xuefy
+ * @version v1.0.0    2021-08-16  xuefy    由Generator自动创建
+ */
+public interface IZcChargeInfService extends IService<ZcChargeInf> {
+    /**
+     * 查询（分页）
+     *
+     * @param request QueryRequest
+     * @param wrapper LambdaQueryWrapper<ZcChargeInf>
+     * @return IPage<ZcChargeInf>
+     */
+    IPage<ZcChargeInf> findZcChargeInfs(QueryRequest request, LambdaQueryWrapper<ZcChargeInf> wrapper);
+
+    /**
+     * 查询（所有）
+     *
+     * @param wrapper LambdaQueryWrapper<ZcChargeInf>
+     * @return List<ZcChargeInf>
+     */
+    List<ZcChargeInf> findZcChargeInfs(LambdaQueryWrapper<ZcChargeInf> wrapper);
+
+    /**
+     * 新增
+     *
+     * @param zcChargeInf zcChargeInf
+     */
+    void createZcChargeInf(ZcChargeInf zcChargeInf);
+
+    /**
+     * 修改
+     *
+     * @param zcChargeInf zcChargeInf
+     */
+    void updateZcChargeInf(ZcChargeInf zcChargeInf);
+
+    /**
+     * 删除
+     *
+     * @param wrapper LambdaQueryWrapper<ZcChargeInf>
+     */
+    void deleteZcChargeInf(LambdaQueryWrapper<ZcChargeInf> wrapper);
+}

tianhu-system/src/main/java/com/tianhu/system/service/OwnAdminAccInfService.java

@@ -0,0 +1,16 @@
+package com.tianhu.system.service;
+
+import java.util.List;
+import java.util.Map;
+
+public interface OwnAdminAccInfService {
+
+
+
+    /**
+     * 查询提现需缴费金额
+     * @param map
+     * @return
+     */
+    public List<Map> selectAdminInfList(Map map);
+}

tianhu-system/src/main/java/com/tianhu/system/service/OwnUserWthdrawalService.java

@@ -0,0 +1,19 @@
+package com.tianhu.system.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+
+import java.util.List;
+import java.util.Map;
+
+public interface OwnUserWthdrawalService {
+
+
+
+    /**
+     * 查询提现需缴费金额
+     * @param map
+     * @return
+     */
+    public List<Map> selectChargeInfList(Map map);
+}

tianhu-system/src/main/java/com/tianhu/system/service/impl/OwnAdminAccInfServiceImpl.java

@@ -0,0 +1,25 @@
+package com.tianhu.system.service.impl;
+
+import com.tianhu.system.mapper.OwnAdminAccInfMapper;
+import com.tianhu.system.mapper.OwnUserWthdrawalMapper;
+import com.tianhu.system.service.OwnAdminAccInfService;
+import com.tianhu.system.service.OwnUserWthdrawalService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class OwnAdminAccInfServiceImpl implements OwnAdminAccInfService {
+    @Autowired
+    private OwnAdminAccInfMapper ownAdminAccInfMapper;
+
+
+
+
+    @Override
+    public List<Map> selectAdminInfList(Map map){
+        return ownAdminAccInfMapper.selectAdminInfList(map);
+    }
+}

tianhu-system/src/main/java/com/tianhu/system/service/impl/OwnPayAccDetailServiceImpl.java

@@ -0,0 +1,27 @@
+package com.tianhu.system.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+import com.tianhu.system.mapper.OwnPayAccDetailMapper;
+import com.tianhu.system.service.IOwnPayAccDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+@Service
+public class OwnPayAccDetailServiceImpl implements IOwnPayAccDetailService {
+    @Autowired
+    private OwnPayAccDetailMapper ownPayAccDetailMapper;
+
+
+    @Override
+    public IPage<Map> selectAccDetailList(Map map, QueryRequest request) {
+        Page page = new Page<>(request.getPageNum(), request.getPageSize());
+        return ownPayAccDetailMapper.selectAccDetailList(page,map);
+    }
+
+
+
+}

tianhu-system/src/main/java/com/tianhu/system/service/impl/OwnUserWthdrawalServiceImpl.java

@@ -0,0 +1,23 @@
+package com.tianhu.system.service.impl;
+
+import com.tianhu.system.mapper.OwnUserWthdrawalMapper;
+import com.tianhu.system.service.OwnUserWthdrawalService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class OwnUserWthdrawalServiceImpl implements OwnUserWthdrawalService {
+    @Autowired
+    private OwnUserWthdrawalMapper ownUserWthdrawalMapper;
+
+
+
+
+    @Override
+    public List<Map> selectChargeInfList(Map map){
+        return ownUserWthdrawalMapper.selectChargeInfList(map);
+    }
+}

tianhu-system/src/main/java/com/tianhu/system/service/impl/PayAccDetailServiceImpl.java

@@ -0,0 +1,64 @@
+package com.tianhu.system.service.impl;
+
+import com.tianhu.system.domain.PayAccDetail;
+import com.tianhu.system.mapper.PayAccDetailMapper;
+import com.tianhu.system.service.IPayAccDetailService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+
+
+import java.util.List;
+
+/**
+ * ClassName: PayAccDetailServiceImpl<br>
+ * Description: IPayAccDetailService实现 <br>
+ * Company: keao
+ *
+ * @author pxh
+ * @version v1.0.0    2021-10-18  pxh    由Generator自动创建
+ */
+@Service
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
+public class PayAccDetailServiceImpl extends ServiceImpl<PayAccDetailMapper, PayAccDetail> implements IPayAccDetailService {
+
+    @Autowired
+    private PayAccDetailMapper payAccDetailMapper;
+
+    @Override
+    public IPage<PayAccDetail> findPayAccDetails(QueryRequest request, LambdaQueryWrapper<PayAccDetail> wrapper) {
+        Page<PayAccDetail> page = new Page<>(request.getPageNum(), request.getPageSize());
+        return this.page(page, wrapper);
+    }
+
+    @Override
+    public List<PayAccDetail> findPayAccDetails(LambdaQueryWrapper<PayAccDetail> wrapper) {
+		return this.list(wrapper);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void createPayAccDetail(PayAccDetail payAccDetail) {
+        this.save(payAccDetail);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updatePayAccDetail(PayAccDetail payAccDetail) {
+        this.saveOrUpdate(payAccDetail);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deletePayAccDetail(LambdaQueryWrapper<PayAccDetail> wrapper) {
+	    this.remove(wrapper);
+	}
+}

tianhu-system/src/main/java/com/tianhu/system/service/impl/ZcChargeInfServiceImpl.java

@@ -0,0 +1,61 @@
+package com.tianhu.system.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.tianhu.system.mapper.ZcChargeInfMapper;
+import com.tianhu.system.service.IZcChargeInfService;
+import com.tianhu.system.domain.ZcChargeInf;
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * ClassName: ZcChargeInfServiceImpl<br>
+ * Description: IZcChargeInfService实现 <br>
+ * Company: keao
+ *
+ * @author xuefy
+ * @version v1.0.0    2021-08-16  xuefy    由Generator自动创建
+ */
+@Service
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
+public class ZcChargeInfServiceImpl extends ServiceImpl<ZcChargeInfMapper, ZcChargeInf> implements IZcChargeInfService {
+
+    @Autowired
+    private ZcChargeInfMapper zcChargeInfMapper;
+
+    @Override
+    public IPage<ZcChargeInf> findZcChargeInfs(QueryRequest request, LambdaQueryWrapper<ZcChargeInf> wrapper) {
+        Page<ZcChargeInf> page = new Page<>(request.getPageNum(), request.getPageSize());
+        return this.page(page, wrapper);
+    }
+
+    @Override
+    public List<ZcChargeInf> findZcChargeInfs(LambdaQueryWrapper<ZcChargeInf> wrapper) {
+		return this.list(wrapper);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void createZcChargeInf(ZcChargeInf zcChargeInf) {
+        this.save(zcChargeInf);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateZcChargeInf(ZcChargeInf zcChargeInf) {
+        this.saveOrUpdate(zcChargeInf);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteZcChargeInf(LambdaQueryWrapper<ZcChargeInf> wrapper) {
+	    this.remove(wrapper);
+	}
+}

tianhu-system/src/main/resources/mapper/system/OwnAdminAccInfMapper.xml

@@ -0,0 +1,27 @@
+<?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.tianhu.system.mapper.OwnAdminAccInfMapper">
+
+    <select id="selectAdminInfList" parameterType="map" resultType="map">
+        SELECT
+        scy_name 'scyName',
+        scy_address 'scyAddress',
+        scy_phone 'scyPhone',
+        scy_legal 'scyLegal',
+        scy_legal_id 'scyLegalId',
+        email 'email'
+        FROM
+          sys_company
+          LEFT JOIN sys_user_company_rel
+               ON sucr_company_id = scy_id
+          LEFT JOIN sys_user
+               ON sucr_user_id = user_id
+        where 1=1
+        AND sucr_handler = '1'
+        <if test="paramMap.companyId != null  and paramMap.companyId != ''">
+            and scy_id = #{paramMap.companyId}
+        </if>
+    </select>
+</mapper>

tianhu-system/src/main/resources/mapper/system/OwnPayAccDetailMapper.xml

@@ -0,0 +1,38 @@
+<?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.tianhu.system.mapper.OwnPayAccDetailMapper">
+
+    <select id="selectAccDetailList" parameterType="map" resultType="map">
+        SELECT
+            PAD_NO 'padNo',
+            PAD_PAYFLOWNO 'padPayflowno',
+            PAD_TRXAMOUT 'padTrxamout',
+            PAD_REMRK 'padRemrk',
+            PAD_STATE 'padState',
+            pai_bank_name 'paiBankName',
+            scy_name 'scyName'
+        FROM
+            pay_acc_detail
+            LEFT JOIN pay_acc_inf
+                ON PAI_ACCNO = PAD_ACCNO
+            LEFT JOIN sys_company
+                ON scy_id = PAD_CSTNO
+        WHERE PAD_STATUS = '0'
+        <if test="paramMap.scyName != null  and paramMap.scyName != ''">
+            and scy_name  like concat('%', #{paramMap.scyName}, '%')
+        </if>
+        <if test="paramMap.paiBankName != null  and paramMap.paiBankName != ''">
+            and pai_bank_name  like concat('%', #{paramMap.paiBankName}, '%')
+        </if>
+        <if test="paramMap.padState != null  and paramMap.padState != ''">
+            and PAD_STATE = #{paramMap.padState}
+        </if>
+        <if test="paramMap.padPayflowno != null  and paramMap.padPayflowno != ''">
+            and PAD_PAYFLOWNO  like concat('%', #{paramMap.padPayflowno}, '%')
+        </if>
+        order by pay_acc_detail.create_time desc
+    </select>
+
+</mapper>

tianhu-system/src/main/resources/mapper/system/OwnUserWthdrawalMapper.xml

@@ -0,0 +1,53 @@
+<?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.tianhu.system.mapper.OwnUserWthdrawalMapper">
+
+    <select id="selectChargeInfList" parameterType="map" resultType="map">
+        SELECT
+            zfr_id 'zfrId',
+            zfr_number 'zfrNumber',
+            zci_amount 'zciAmount',
+            zci_id 'zciId',
+            zci_status 'zciStatus'
+        FROM
+            zc_finance_record
+        LEFT JOIN zc_charge_inf
+            ON zci_finance_id = zfr_id
+        LEFT JOIN zc_finance_inf
+            ON zfi_id = zfr_finance_id
+        WHERE 1 = 1
+        and zfr_status in('01','03')
+        and zci_status in('00','05')
+        <if test="paramMap.companyId != null  and paramMap.companyId != ''">
+            and zfi_supplier_id = #{paramMap.companyId}
+        </if>
+        <if test="paramMap.accNo != null  and paramMap.accNo != ''">
+            and zfr_collection_account = #{paramMap.accNo}
+        </if>
+        order by zc_finance_record.create_time desc
+    </select>
+    <select id="selectBillInfList" parameterType="map" resultType="map">
+        SELECT
+        b.zbi_id            'zbiId',
+        b.zbi_number        'zbiNumber',
+        b.zbi_name          'zbiName',
+        DATE_FORMAT(b.zbi_pay_date, '%Y-%m-%d') AS 'zbiPayDate',
+        IFNULL(CAST(ROUND(b.zbi_amount,2)AS CHAR),0.00) as 'zbiAmount',
+        s.scy_name          'payer',
+        c.scy_name          'payee'
+        FROM
+        zc_bill_inf b
+        LEFT JOIN sys_company s
+        ON s.scy_id = b.zbi_payer_id
+        LEFT JOIN sys_company c
+        ON c.scy_id = b.zbi_payee_id
+        where 1=1
+--         zbi_status = '00'
+        <if test="paramMap.billIdList != null  and paramMap.billIdList != ''">
+            and b.zbi_id  IN (${paramMap.billIdList})
+        </if>
+        order by b.create_time desc
+    </select>
+</mapper>

tianhu-system/src/main/resources/mapper/system/PayAccDetailMapper.xml

@@ -0,0 +1,30 @@
+<?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.tianhu.system.mapper.PayAccDetailMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.tianhu.system.domain.PayAccDetail">
+        <id column="PAD_NO" property="padNo" />
+        <result column="PAD_CSTNO" property="padCstno" />
+        <result column="PAD_ACCNO" property="padAccno" />
+        <result column="PAD_VERSION" property="padVersion" />
+        <result column="PAD_STATUS" property="padStatus" />
+        <result column="PAD_BALANCE" property="padBalance" />
+        <result column="PAD_AVABALANCE" property="padAvabalance" />
+        <result column="PAD_ACCTYPE" property="padAcctype" />
+        <result column="PAD_CRYTYPE" property="padCrytype" />
+        <result column="PAD_TRXAMOUT" property="padTrxamout" />
+        <result column="PAD_PAYFLOWNO" property="padPayflowno" />
+        <result column="PAD_TRANTYPE" property="padTrantype" />
+        <result column="PAD_REMRK" property="padRemrk" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="PAD_STATE" property="padState" />
+        <result column="pad_business_id" property="padBusinessId" />
+        <result column="pad_tar_count" property="padTarCount" />
+        <result column="pad_pay_count" property="padPayCount" />
+    </resultMap>
+
+</mapper>

tianhu-system/src/main/resources/mapper/system/ZcChargeInfMapper.xml

@@ -0,0 +1,28 @@
+<?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.tianhu.system.mapper.ZcChargeInfMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.tianhu.system.domain.ZcChargeInf">
+        <id column="zci_id" property="zciId" />
+        <result column="zci_finance_id" property="zciFinanceId" />
+        <result column="zci_amount" property="zciAmount" />
+        <result column="zci_status" property="zciStatus" />
+        <result column="zci_invoice_status" property="zciInvoiceStatus" />
+        <result column="zci_express_no" property="zciExpressNo" />
+        <result column="zci_profit_spare1" property="zciProfitSpare1" />
+        <result column="zci_profit_spare2" property="zciProfitSpare2" />
+        <result column="zci_profit_spare3" property="zciProfitSpare3" />
+        <result column="zci_profit_spare4" property="zciProfitSpare4" />
+        <result column="zci_profit_spare5" property="zciProfitSpare5" />
+        <result column="zci_profit_spare6" property="zciProfitSpare6" />
+        <result column="zci_profit_spare7" property="zciProfitSpare7" />
+        <result column="zci_profit_spare8" property="zciProfitSpare8" />
+        <result column="zci_profit_spare9" property="zciProfitSpare9" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+</mapper>