企业认证流程修改

tianhu-system/src/main/java/com/tianhu/system/companyAuth/controller/OwnAuthController.java

@@ -11,6 +11,7 @@ import com.tianhu.common.core.domain.R;
 import com.tianhu.common.core.exception.BaseException;
 import com.tianhu.common.core.utils.*;
 import com.tianhu.common.core.web.controller.BaseController;
+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.service.RedisService;
@@ -24,6 +25,7 @@ import com.tianhu.system.api.domain.SysUser;
 import com.tianhu.system.api.model.LoginUser;
 import com.tianhu.system.common.IMessageUtilsService;
 import com.tianhu.system.companyAuth.service.IOwnAuthService;
+import com.tianhu.system.controller.OwnSysUserController;
 import com.tianhu.system.domain.*;
 import com.tianhu.system.mapper.SysProductMenuMapper;
 import com.tianhu.system.mapper.SysRoleMapper;
@@ -45,7 +47,10 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -189,6 +194,11 @@ public class OwnAuthController extends BaseController {
     private String zhucechenggong = "zhucechenggong";
 
     /**
+     * 默认的文件名最大长度 70
+     */
+    public static final int DEFAULT_FILE_NAME_LENGTH = 60;
+
+    /**
      * 新增企业认证
      *
      * @param map    企业信息
@@ -695,7 +705,6 @@ public class OwnAuthController extends BaseController {
                 sysUserCompanyRelService.createSysUserCompanyRel(sysUserCompanyRel);
             }
         }
-
         //创建其他和管理员
         SysUser operatorUser = null;
 
@@ -746,38 +755,41 @@ public class OwnAuthController extends BaseController {
         redisService.setCacheObject(CacheConstants.LOGIN_TOKEN_KEY + token, userInfo, Constants.TOKEN_EXPIRE * 60, TimeUnit.SECONDS);
         //返回企业信息
         SysCompany company = sysCompanyService.getById(scyId);
-        // 审批增加分组
-        Map<String, Object> flowableRes = flowableService.addFlowableGroup(scyId, company.getScyName());
-        if (!"200".equals(flowableRes.get("code"))) {
-            throw new Exception("审批数据新增失败!");
-        }
-        flowableRes = flowableService.addFlowableGroup(deptList.get(0).getAlternateNumber(), dept.getDeptName());
-        if (!"200".equals(flowableRes.get("code"))) {
-            throw new Exception("审批数据新增失败!");
-        }
-        // 经办人与登录用户是同一手机号
-        if (use.getUserName().equals(phoneNumber)) {
-            flowableRes = flowableService.addFlowableUser(String.valueOf(use.getUserId()), use.getNickName(), scyId);
-            if (!"200".equals(flowableRes.get("code"))) {
-                throw new Exception("审批数据新增失败!");
-            }
-        } else {
-            flowableRes = flowableService.addFlowableUser(String.valueOf(use.getUserId()), use.getNickName(), scyId);
-            if (!"200".equals(flowableRes.get("code"))) {
-                throw new Exception("审批数据新增失败!");
-            }
-            flowableRes = flowableService.addFlowableUser(String.valueOf(handlerUser.getUserId()), handlerUser.getNickName(), scyId);
-            if (!"200".equals(flowableRes.get("code"))) {
-                throw new Exception("审批数据新增失败!");
-            }
-        }
-        // 业务人员不存在
-        if (operatorUser != null) {
-            flowableRes = flowableService.addFlowableUser(String.valueOf(operatorUser.getUserId()), operatorUser.getNickName(), scyId);
-            if (!"200".equals(flowableRes.get("code"))) {
-                throw new Exception("审批数据新增失败!");
-            }
-        }
+        String tittle = "【企业认证】"+scyName+"CFCA工商四要素认证失败，请联系用户"+phoneNumber+"线下核实企业信息；";
+       ownNoticeService.sendNotice(scyId,scyId,tittle,"00",null,"09","0","1",null, null, null);
+
+//        // 审批增加分组
+//        Map<String, Object> flowableRes = flowableService.addFlowableGroup(scyId, company.getScyName());
+//        if (!"200".equals(flowableRes.get("code"))) {
+//            throw new Exception("审批数据新增失败!");
+//        }
+//        flowableRes = flowableService.addFlowableGroup(deptList.get(0).getAlternateNumber(), dept.getDeptName());
+//        if (!"200".equals(flowableRes.get("code"))) {
+//            throw new Exception("审批数据新增失败!");
+//        }
+//        // 经办人与登录用户是同一手机号
+//        if (use.getUserName().equals(phoneNumber)) {
+//            flowableRes = flowableService.addFlowableUser(String.valueOf(use.getUserId()), use.getNickName(), scyId);
+//            if (!"200".equals(flowableRes.get("code"))) {
+//                throw new Exception("审批数据新增失败!");
+//            }
+//        } else {
+//            flowableRes = flowableService.addFlowableUser(String.valueOf(use.getUserId()), use.getNickName(), scyId);
+//            if (!"200".equals(flowableRes.get("code"))) {
+//                throw new Exception("审批数据新增失败!");
+//            }
+//            flowableRes = flowableService.addFlowableUser(String.valueOf(handlerUser.getUserId()), handlerUser.getNickName(), scyId);
+//            if (!"200".equals(flowableRes.get("code"))) {
+//                throw new Exception("审批数据新增失败!");
+//            }
+//        }
+//        // 业务人员不存在
+//        if (operatorUser != null) {
+//            flowableRes = flowableService.addFlowableUser(String.valueOf(operatorUser.getUserId()), operatorUser.getNickName(), scyId);
+//            if (!"200".equals(flowableRes.get("code"))) {
+//                throw new Exception("审批数据新增失败!");
+//            }
+//        }
 
         return R.ok(company);
     }
@@ -790,6 +802,9 @@ public class OwnAuthController extends BaseController {
      */
     @PostMapping("/getlicense")
     public R getlicense(MultipartFile file) throws Exception {
+        if(file.getOriginalFilename().length()>DEFAULT_FILE_NAME_LENGTH){
+            throw new Exception("文件名称太长，建议长度小于"+DEFAULT_FILE_NAME_LENGTH);
+        }
         SysCompany sysCompany = null;
         //获取上传文件token
         try{
@@ -824,6 +839,9 @@ public class OwnAuthController extends BaseController {
      */
     @PostMapping("/getCardPositive")
     public R getCardPositive(MultipartFile file,String fileType) throws Exception {
+        if(file.getOriginalFilename().length()>DEFAULT_FILE_NAME_LENGTH){
+            throw new Exception("文件名称太长，建议长度小于"+DEFAULT_FILE_NAME_LENGTH);
+        }
         Map map =null;
         //获取企业信息
         try{
@@ -892,47 +910,6 @@ public class OwnAuthController extends BaseController {
         bank.eq(PayBankAccInf::getPbaiAccountName,pbaiAccountName);
         bank.eq(PayBankAccInf::getPbaiBankaccountId,pbaiBankaccountId);
         List<PayBankAccInf> bankAcc = payBankAccInfService.findPayBankAccInfs(bank);
-
-        if(bankAcc.size()>0){
-            //取得指定时间间隔后的系统时间
-            GregorianCalendar calendar = (GregorianCalendar) Calendar.getInstance();
-            calendar.add( Calendar.DAY_OF_MONTH, 3);
-            SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmmss");
-            System.out.println("比较时间"+formatter.format(calendar.getTime()));
-            System.out.println("最后时间"+formatter.format(bankAcc.get(0).getPbaiCfcaDate()));
-            if(formatter.format(calendar.getTime()).compareTo(formatter.format(bankAcc.get(0).getPbaiCfcaDate()))<0){
-                throw new BaseException("当前账户已存在");
-            }else{
-                //企业打款申请
-                JSONObject operatorAuth = CfcaUtil.paymentApply(ISPRO, INSTITUTIONID, pbaiAccountName, pbaiBankaccountId,list.get(0).getZcbiBankNo(),zbiRemark);
-            /*JSONObject operatorAuth = new JSONObject();
-            operatorAuth.put("Message", "SUCCESS");
-            operatorAuth.put("Status", "20");
-            operatorAuth.put("TxSN", "100000001");*/
-                System.out.print("绑定对公户返回结果==========>" + operatorAuth);
-                String  TxSN =  operatorAuth.getString("TxSN");
-                if("SUCCESS".equals(operatorAuth.getString("Message"))){
-                    if(!"20".equals(operatorAuth.getString("Status"))){
-                        return R.fail("绑定账户失败");
-                    };
-                }else{
-                    return R.fail("绑定账户失败");
-                }
-                PayBankAccInf payBankAccInf = new PayBankAccInf();
-                String  pbiId  =  IdUtils.fastSimpleUUID();
-                payBankAccInf.setPbaiId(pbiId);
-                payBankAccInf.setPbaiCstno(scyId);
-                payBankAccInf.setPbaiAccountName(pbaiAccountName);
-                payBankAccInf.setPbaiBankaccountId(pbaiBankaccountId);
-                payBankAccInf.setPbaiBankName(list.get(0).getZcbiBankName());
-                payBankAccInf.setPbaiStatus("1");
-                payBankAccInf.setPbaiCfcaNo(TxSN);
-                //获取当前时间
-                Date currentTime = DateUtils.getNowDate();
-                payBankAccInf.setPbaiCfcaDate(currentTime);
-                payBankAccInfService.createPayBankAccInf(payBankAccInf);
-            }
-            }else{
             //企业打款申请
             JSONObject operatorAuth = CfcaUtil.paymentApply(ISPRO, INSTITUTIONID, pbaiAccountName, pbaiBankaccountId,list.get(0).getZcbiBankNo(),zbiRemark);
             /*JSONObject operatorAuth = new JSONObject();
@@ -956,6 +933,7 @@ public class OwnAuthController extends BaseController {
             payBankAccInf.setPbaiBankaccountId(pbaiBankaccountId);
             payBankAccInf.setPbaiBankName(list.get(0).getZcbiBankName());
             payBankAccInf.setPbaiStatus("1");
+            payBankAccInf.setPbaiCfcaTime("0");
             payBankAccInf.setPbaiCfcaNo(TxSN);
             //获取当前时间
             Date currentTime = DateUtils.getNowDate();
@@ -965,8 +943,9 @@ public class OwnAuthController extends BaseController {
             sysCompany.setScyId(scyId);
             //打款认证
             sysCompany.setScyStatus("05");
+            //对公户打款次数
+            sysCompany.setScyCfcaAuthNumber(AmtUtil.add(bankAcc.get(0).getPbaiCfcaTime(),"1",0));
             sysCompanyService.updateSysCompany(sysCompany);
-        }
         // 刷新登录用户菜单和权限
         SysUser sysUser = user.getSysUser();
         sysUser.setCompanyId(scyId);
@@ -986,27 +965,30 @@ public class OwnAuthController extends BaseController {
     @PostMapping("/payment")
     @Log(title = "打款验证", businessType = BusinessType.UPDATE)
     public R payment(@RequestBody Map<String,Object> map,HttpServletRequest request) throws Exception {
-        //获取登录用户
+        //获取登录用户/47.94.174.212:7001
         LoginUser userInfo = tokenService.getLoginUser();
         SysUser users = userInfo.getSysUser();
-        LambdaQueryWrapper<SysUserCompanyRel> userCompanyRel = new LambdaQueryWrapper<>();
-        //用户名
-        userCompanyRel.eq(SysUserCompanyRel::getSucrUserId,users.getUserId());
-        List<SysUserCompanyRel> companyRel = sysUserCompanyRelService.findSysUserCompanyRels(userCompanyRel);
-        if(companyRel.size()==0){
-            return  R.fail("企业未认证请联系管理员");
-        }else if(CommonUtil.isEmpty(companyRel.get(0).getSucrCompanyId())){
-            return  R.fail("企业认证失败请联系管理员");
-        }
+//        LambdaQueryWrapper<SysUserCompanyRel> userCompanyRel = new LambdaQueryWrapper<>();
+//        //用户名
+//        userCompanyRel.eq(SysUserCompanyRel::getSucrUserId,users.getUserId());
+//        List<SysUserCompanyRel> companyRel = sysUserCompanyRelService.findSysUserCompanyRels(userCompanyRel);
+//        if(companyRel.size()==0){
+//            return  R.fail("企业未认证请联系管理员");
+//        }else if(CommonUtil.isEmpty(companyRel.get(0).getSucrCompanyId())){
+//            return  R.fail("企业认证失败请联系管理员");
+//        }
         //查询账户
         LambdaQueryWrapper<PayBankAccInf> bank = new LambdaQueryWrapper<>();
         //所属银行
-        bank.eq(PayBankAccInf::getPbaiCstno,companyRel.get(0).getSucrCompanyId());
+        bank.eq(PayBankAccInf::getPbaiCstno,users.getCompanyId());
         bank.orderByDesc(PayBankAccInf::getPbaiCfcaDate);
         List<PayBankAccInf> bankAcc = payBankAccInfService.findPayBankAccInfs(bank);
         if(bankAcc.size()==0){
             return  R.fail("所属账号不存在");
         }
+        if(Integer.valueOf(bankAcc.get(0).getPbaiCfcaTime())>=3){
+            throw new Exception("当前账户打款上限，请重新申请开户!");
+        }
         //企业id
         String scyId = CommonUtil.objToString(map.get("scyId"));
         //金额(元)
@@ -1031,23 +1013,28 @@ public class OwnAuthController extends BaseController {
         operatorAuth.put("Message", "SUCCESS");
         operatorAuth.put("Verification", "20");*/
         System.out.print("打款认证结果==========>" + operatorAuth);
+        PayBankAccInf payBankAccInf =new PayBankAccInf();
         if (!"交易异常[已验证通过，不能重复验证]".equals(operatorAuth.getString("Message"))) {
             //校验已通过
             if ("SUCCESS".equals(operatorAuth.getString("Message"))) {
                 if (!"20".equals(operatorAuth.getString("Verification"))) {
+                    payBankAccInf.setPbaiCfcaTime(AmtUtil.add(bankAcc.get(0).getPbaiCfcaTime(),"1",0));
+                    payBankAccInfService.updatePayBankAccInf(payBankAccInf);
                     return R.fail("账户验证失败");
                 }
                 ;
             } else {
+                payBankAccInf.setPbaiCfcaTime(AmtUtil.add(bankAcc.get(0).getPbaiCfcaTime(),"1",0));
+                payBankAccInfService.updatePayBankAccInf(payBankAccInf);
                 return R.fail("账户验证失败");
             }
         }
-        PayBankAccInf payBankAccInf =new PayBankAccInf();
         payBankAccInf.setPbaiId(bankAcc.get(0).getPbaiId());
         payBankAccInf.setPbaiStatus("0");
+        payBankAccInf.setPbaiCfcaTime(AmtUtil.add(bankAcc.get(0).getPbaiCfcaTime(),"1",0));
         payBankAccInfService.updatePayBankAccInf(payBankAccInf);
         SysCompany sysCompany =new SysCompany();
-        sysCompany.setScyId(companyRel.get(0).getSucrCompanyId());
+        sysCompany.setScyId(users.getCompanyId());
         //待实名认证
         sysCompany.setScyStatus("04");
         sysCompanyService.updateSysCompany(sysCompany);
@@ -1364,6 +1351,33 @@ public class OwnAuthController extends BaseController {
     }
 
     /**
+     * 企业账户验证网联支持银行列表
+     */
+    @PostMapping("/bankList")
+    public void bankList(HttpServletResponse response) throws FileNotFoundException {
+        // 下载本地文件
+        String fileName = "Operator.doc".toString(); // 文件的默认保存名
+        // 读到流中
+        InputStream inStream = OwnSysUserController.class.getClassLoader().getResourceAsStream("企业账户验证网联支持银行列表.xlsx");
+
+        // 设置输出的格式
+        response.reset();
+        response.setContentType("bin");
+        response.addHeader("Content-Disposition", "attachment; filename=\"" + fileName + "\"");
+        // 循环取出流中的数据
+        byte[] b = new byte[100];
+        int len;
+        try {
+            while ((len = inStream.read(b)) > 0) {
+                response.getOutputStream().write(b, 0, len);
+            }
+            inStream.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
      * 查询银行
      *
      * @return

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

@@ -221,7 +221,7 @@ public class OwnManagementInfController extends BaseController
         if(CommonUtil.isEmpty(scyName)){
             return R.fail("资金方名称不可为空");
         }
-        if(!RegularUtil.special(scyName)){
+        if(!RegularUtil.companyName(scyName)){
             return R.fail("资金方名称不能含有特殊字符");
         }
         String smiType = CommonUtil.objToString(map.get("smiType"));

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

@@ -0,0 +1,113 @@
+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 cuixq
+ * @since 2021-09-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("pay_acc_inf")
+public class PayAccInf implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 企业ID(sys_company.scy_id)
+     */
+    @TableId("PAI_CSTNO")
+    private String paiCstno;
+
+    /**
+     * 账号
+     */
+    @TableField("PAI_ACCNO")
+    private String paiAccno;
+
+    /**
+     * 版本号
+     */
+    @TableField("PAI_VERSION")
+    private Integer paiVersion;
+
+    /**
+     * 账户状态(0:未开通，1：冻结,2已开通3:待激活)
+     */
+    @TableField("PAI_STATUS")
+    private String paiStatus;
+
+    /**
+     * 余额
+     */
+    @TableField("PAI_BALANCE")
+    private String paiBalance;
+
+    /**
+     * 可用余额
+     */
+    @TableField("PAI_AVABALANCE")
+    private String paiAvabalance;
+
+    /**
+     * 账户类型(00基本账户01贷款账户02信用账户03手续费账户04待结算账户05提现账户06邢台银行虚拟账户)
+     */
+    @TableField("PAI_ACCTYPE")
+    private String paiAcctype;
+
+    /**
+     * 币种(CNY)
+     */
+    @TableField("PAI_CRYTYPE")
+    private String paiCrytype;
+
+    /**
+     * 开户行号
+     */
+    @TableField("PAI_QLBANKNO")
+    private String paiQlbankno;
+
+    /**
+     * 开户行名
+     */
+    @TableField("PAI_QLBANKNAME")
+    private String paiQlbankname;
+
+    /**
+     * 创建人
+     */
+    @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/domain/PayBankAccInf.java

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author cuixq
- * @since 2021-08-25
+ * @since 2021-09-23
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -74,6 +74,12 @@ public class PayBankAccInf implements Serializable {
     private Date pbaiCfcaDate;
 
     /**
+     * CFCA验证次数
+     */
+    @TableField("PBAI_CFCA_TIME")
+    private String pbaiCfcaTime;
+
+    /**
      * 状态（0：激活；1：停用; 2:删除）
      */
     @TableField("PBAI_STATUS")

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

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author cuixq
- * @since 2021-09-13
+ * @since 2021-09-23
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -164,6 +164,18 @@ public class SysCompany implements Serializable {
     private String scyCfcaUserId;
 
     /**
+     * CFCA授权编号
+     */
+    @TableField("scy_cfca_auth_number")
+    private String scyCfcaAuthNumber;
+
+    /**
+     * CFCA当日打款次数
+     */
+    @TableField("scy_cfca_bank_time")
+    private String scyCfcaBankTime;
+
+    /**
      * 备注
      */
     @TableField("scy_remarks")

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

@@ -0,0 +1,16 @@
+package com.tianhu.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.tianhu.system.domain.PayAccInf;
+
+/**
+ * <p>
+ * 账户信息表 Mapper 接口
+ * </p>
+ *
+ * @author cuixq
+ * @since 2021-09-23
+ */
+public interface PayAccInfMapper extends BaseMapper<PayAccInf> {
+
+}

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

@@ -9,7 +9,7 @@ import com.tianhu.system.domain.SysCompany;
  * </p>
  *
  * @author cuixq
- * @since 2021-08-16
+ * @since 2021-09-23
  */
 public interface SysCompanyMapper extends BaseMapper<SysCompany> {
 

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

@@ -0,0 +1,58 @@
+package com.tianhu.system.service;
+
+
+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 com.tianhu.system.domain.PayAccInf;
+
+import java.util.List;
+
+/**
+ * ClassName: IPayAccInfService<br>
+ * Description: PayAccInfService接口 <br>
+ * Company: keao
+ *
+ * @author cuixq
+ * @version v1.0.0    2021-09-23  cuixq    由Generator自动创建
+ */
+public interface IPayAccInfService extends IService<PayAccInf> {
+    /**
+     * 查询（分页）
+     *
+     * @param request QueryRequest
+     * @param wrapper LambdaQueryWrapper<PayAccInf>
+     * @return IPage<PayAccInf>
+     */
+    IPage<PayAccInf> findPayAccInfs(QueryRequest request, LambdaQueryWrapper<PayAccInf> wrapper);
+
+    /**
+     * 查询（所有）
+     *
+     * @param wrapper LambdaQueryWrapper<PayAccInf>
+     * @return List<PayAccInf>
+     */
+    List<PayAccInf> findPayAccInfs(LambdaQueryWrapper<PayAccInf> wrapper);
+
+    /**
+     * 新增
+     *
+     * @param payAccInf payAccInf
+     */
+    void createPayAccInf(PayAccInf payAccInf);
+
+    /**
+     * 修改
+     *
+     * @param payAccInf payAccInf
+     */
+    void updatePayAccInf(PayAccInf payAccInf);
+
+    /**
+     * 删除
+     *
+     * @param wrapper LambdaQueryWrapper<PayAccInf>
+     */
+    void deletePayAccInf(LambdaQueryWrapper<PayAccInf> wrapper);
+}

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

@@ -1,9 +1,10 @@
 package com.tianhu.system.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
+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 com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
 import com.tianhu.system.domain.SysCompany;
 
 import java.util.List;
@@ -14,7 +15,7 @@ import java.util.List;
  * Company: keao
  *
  * @author cuixq
- * @version v1.0.0    2021-08-16  cuixq    由Generator自动创建
+ * @version v1.0.0    2021-09-23  cuixq    由Generator自动创建
  */
 public interface ISysCompanyService extends IService<SysCompany> {
     /**

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

@@ -0,0 +1,64 @@
+package com.tianhu.system.service.impl;
+
+import com.tianhu.system.domain.PayAccInf;
+import com.tianhu.system.mapper.PayAccInfMapper;
+import com.tianhu.system.service.IPayAccInfService;
+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: PayAccInfServiceImpl<br>
+ * Description: IPayAccInfService实现 <br>
+ * Company: keao
+ *
+ * @author cuixq
+ * @version v1.0.0    2021-09-23  cuixq    由Generator自动创建
+ */
+@Service
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
+public class PayAccInfServiceImpl extends ServiceImpl<PayAccInfMapper, PayAccInf> implements IPayAccInfService {
+
+    @Autowired
+    private PayAccInfMapper payAccInfMapper;
+
+    @Override
+    public IPage<PayAccInf> findPayAccInfs(QueryRequest request, LambdaQueryWrapper<PayAccInf> wrapper) {
+        Page<PayAccInf> page = new Page<>(request.getPageNum(), request.getPageSize());
+        return this.page(page, wrapper);
+    }
+
+    @Override
+    public List<PayAccInf> findPayAccInfs(LambdaQueryWrapper<PayAccInf> wrapper) {
+		return this.list(wrapper);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void createPayAccInf(PayAccInf payAccInf) {
+        this.save(payAccInf);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updatePayAccInf(PayAccInf payAccInf) {
+        this.saveOrUpdate(payAccInf);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deletePayAccInf(LambdaQueryWrapper<PayAccInf> wrapper) {
+	    this.remove(wrapper);
+	}
+}

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

@@ -24,7 +24,7 @@ import java.util.List;
  * Company: keao
  *
  * @author cuixq
- * @version v1.0.0    2021-08-18  cuixq    由Generator自动创建
+ * @version v1.0.0    2021-09-23  cuixq    由Generator自动创建
  */
 @Service
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)

tianhu-system/src/main/java/com/tianhu/system/utils/RegularUtil.java

@@ -21,6 +21,8 @@ public class RegularUtil {
     private static final String SOCIAL = "^([0-9A-HJ-NPQRTUWXY]{2}\\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\\d{14})$";
     //特殊字符
     private static final String SPECIAL  ="^([\\u4e00-\\u9fa5]|[a-zA-Z0-9])+$";
+    //企业名称校验
+    private static final String COMPANYNAME  ="^[0-9A-Z\\u4E00-\\u9FFF《》()（）-]+$";
 
 
     /**
@@ -96,4 +98,15 @@ public class RegularUtil {
         Matcher match = pattern.matcher(str);
         return match.matches();
     }
+
+    /**
+     *企业名称正则校验
+     * @param str
+     * @return
+     */
+    public static boolean companyName(String str) {
+        Pattern pattern = Pattern.compile(COMPANYNAME);
+        Matcher match = pattern.matcher(str);
+        return match.matches();
+    }
 }

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

@@ -0,0 +1,23 @@
+<?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.PayAccInfMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.tianhu.system.domain.PayAccInf">
+        <id column="PAI_CSTNO" property="paiCstno" />
+        <result column="PAI_ACCNO" property="paiAccno" />
+        <result column="PAI_VERSION" property="paiVersion" />
+        <result column="PAI_STATUS" property="paiStatus" />
+        <result column="PAI_BALANCE" property="paiBalance" />
+        <result column="PAI_AVABALANCE" property="paiAvabalance" />
+        <result column="PAI_ACCTYPE" property="paiAcctype" />
+        <result column="PAI_CRYTYPE" property="paiCrytype" />
+        <result column="PAI_QLBANKNO" property="paiQlbankno" />
+        <result column="PAI_QLBANKNAME" property="paiQlbankname" />
+        <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>

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

@@ -12,6 +12,7 @@
         <result column="PBAI_BANK_NAME" property="pbaiBankName" />
         <result column="PBAI_CFCA_NO" property="pbaiCfcaNo" />
         <result column="PBAI_CFCA_DATE" property="pbaiCfcaDate" />
+        <result column="PBAI_CFCA_TIME" property="pbaiCfcaTime" />
         <result column="PBAI_STATUS" property="pbaiStatus" />
         <result column="PBAI_BASIC" property="pbaiBasic" />
         <result column="create_by" property="createBy" />

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

@@ -27,6 +27,8 @@
         <result column="scy_manager" property="scyManager" />
         <result column="scy_contract_id" property="scyContractId" />
         <result column="scy_cfca_user_id" property="scyCfcaUserId" />
+        <result column="scy_cfca_auth_number" property="scyCfcaAuthNumber" />
+        <result column="scy_cfca_bank_time" property="scyCfcaBankTime" />
         <result column="scy_remarks" property="scyRemarks" />
         <result column="scy_auth_status" property="scyAuthStatus" />
         <result column="scy_status" property="scyStatus" />

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

@@ -204,7 +204,7 @@
 			<if test="password != null and password != ''">password = #{password},</if>
 			<if test="status != null and status != ''">status = #{status},</if>
 			<if test="frozen_second != null and frozen_second != ''">frozen_second = #{frozen_second},</if>
-			<if test="frozen_date != null and frozen_date != ''">frozen_date = #{frozen_date},</if>
+			<if test="frozen_date != null">frozen_date = #{frozen_date},</if>
 			<if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
 			<if test="loginDate != null">login_date = #{loginDate},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>