Merge branch 'master' of http://git.minpay.cc/SupplyChain/system

tianhu-system/pom.xml

@@ -150,6 +150,32 @@
             <scope>system</scope>
             <systemPath>${pom.basedir}/src/lib/taobao-sdk-java-auto_1479188381469-20210630.jar</systemPath>
         </dependency>
+
+        <!-- Hibernate Validator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin.external.google</groupId>
+            <artifactId>android-json</artifactId>
+            <version>0.0.20131108.vaadin1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-scratchpad</artifactId>
+        </dependency>
+        <!-- FastDFS 分布式文件系统 -->
+        <dependency>
+            <groupId>com.github.tobato</groupId>
+            <artifactId>fastdfs-client</artifactId>
+            <version>1.26.5</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -0,0 +1,289 @@
+package com.tianhu.system.companyAuth.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.tianhu.common.core.cfca.CfcaUtil;
+import com.tianhu.common.core.domain.R;
+import com.tianhu.common.core.utils.CommonUtil;
+import com.tianhu.common.core.utils.IdUtils;
+import com.tianhu.common.core.utils.SecurityUtils;
+import com.tianhu.common.core.utils.ServletUtils;
+import com.tianhu.common.core.web.controller.BaseController;
+import com.tianhu.common.security.service.TokenService;
+import com.tianhu.system.api.RemoteFileService;
+import com.tianhu.system.api.domain.PubFileInf;
+import com.tianhu.system.api.model.LoginUser;
+import com.tianhu.system.companyAuth.service.IOwnAuthService;
+import com.tianhu.system.domain.PayBankAccInf;
+import com.tianhu.system.domain.SysCompany;
+import com.tianhu.system.domain.ZcCfcaBankInf;
+import com.tianhu.system.service.IPayBankAccInfService;
+import com.tianhu.system.service.ISysCompanyService;
+import com.tianhu.system.service.IZcCfcaBankInfService;
+import org.json.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 企业认证管理
+ *
+ * @author cuixq@minpay.cc
+ * @date 2021-08-20
+ */
+@RestController
+@RequestMapping("companyAuth")
+public class OwnAuthController extends BaseController {
+
+    @Autowired
+    private TokenService tokenService;
+
+    @Autowired
+    private IOwnAuthService ownAuthService;
+
+    @Autowired
+    private ISysCompanyService sysCompanyService;
+
+    @Autowired
+    private IPayBankAccInfService  payBankAccInfService;
+    @Autowired
+    private IZcCfcaBankInfService zcCfcaBankInfService;
+
+    @Autowired
+    private RemoteFileService remoteFileService;
+    /**
+     * CFCA (是否开启生产环境配置 true 开启 false 关闭)
+     */
+    private static  boolean ISPRO = false;
+    /**
+     * CFCA机构编号 (测试环境默认：100804)
+     */
+    private static String INSTITUTIONID = "100804";
+    /**
+     * 证件类型 (暂只支持 0=身份证 2=护照 3=军官证 4=士兵证 5=港澳居民来往内地通行 证 6=台湾同胞来往内地通行 证 8=外国人居留证 9=警官证 Z=港澳台居民身份证 R=居住证 L=居留证)
+     */
+    private static String IDENTIFICATIONTYPE = "0";
+
+    /**
+     * 新增企业认证
+     *
+     * @param map    企业信息
+     * @return
+     */
+    @PostMapping("/add")
+    public R add(@RequestBody Map<String,Object> map) throws Exception {
+        //获取登录用户
+        LoginUser user = tokenService.getLoginUser();
+        //企业名称
+        String scyName = CommonUtil.objToString(map.get("scyName"));
+        //社会信用代码
+        String scySocialCode = CommonUtil.objToString(map.get("scySocialCode"));
+        //注册资本
+        String scyRegisteredCapital = CommonUtil.objToString(map.get("scyRegisteredCapital"));
+        //时间格式化
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        //注册时间
+        String scyStartTime = sdf.format(CommonUtil.objToString(map.get("scyStartTime")));
+        //到期时间
+        String scyEndTime = sdf.format(CommonUtil.objToString(map.get("scyEndTime")));
+        //企业地址
+        String scyAddress = CommonUtil.objToString(map.get("scyAddress"));
+        //企业电话
+        String scyPhone = CommonUtil.objToString(map.get("scyPhone"));
+        //法人姓名
+        String scyLegal = CommonUtil.objToString(map.get("scyLegal"));
+        //法人证件号码
+        String scyLegalId = CommonUtil.objToString(map.get("scyLegalId"));
+        //营业执照
+        String scyLicenseFile = CommonUtil.objToString(map.get("scyLicenseFile"));
+        //经办人姓名
+        String name = CommonUtil.objToString(map.get("name"));
+        //经办人身份证号
+        String nameCard = CommonUtil.objToString(map.get("nameCard"));
+        //经办人手机号
+        String phoneNumber = CommonUtil.objToString(map.get("phoneNumber"));
+        //备注
+        String zbiRemark = CommonUtil.objToString(map.get("zbiRemark"));
+        SysCompany SysCompany = new SysCompany();
+        String  scyId  =  IdUtils.fastSimpleUUID();
+        SysCompany.setScyId(scyId);
+        sysCompanyService.createSysCompany(SysCompany);
+        //运营商三要素
+        JSONObject operatorAuth = CfcaUtil.operatorAuth(ISPRO, INSTITUTIONID, name, IDENTIFICATIONTYPE, nameCard, phoneNumber, zbiRemark);
+        System.out.print("运营商三要素结果==========>" + operatorAuth);
+  /*      operatorAuth.getJSONObject(WORDS_RESULT);*/
+        //工商四要素
+        JSONObject companyAuth = CfcaUtil.companyAuth(ISPRO, INSTITUTIONID, scyName, scySocialCode, scyLegal, IDENTIFICATIONTYPE, scyLegalId, zbiRemark);
+        System.out.print("工商四要素结果==========>" + companyAuth);
+        return R.ok();
+    }
+
+    /**
+     * 营业执照识别
+     *
+     * @param file    文件
+     * @return
+     */
+    @PostMapping("/getlicense")
+    public SysCompany getlicense(@RequestParam("file") MultipartFile file) {
+        //获取登录用户
+        LoginUser user = tokenService.getLoginUser();
+        String companyId = user.getSysUser().getCompanyId();
+        //获取企业信息
+        SysCompany sysCompany = ownAuthService.businessLicense(file);
+        LambdaQueryWrapper<SysCompany> queryWrapper = new LambdaQueryWrapper<>();
+        //企业名称
+        queryWrapper.eq(SysCompany::getScyName,sysCompany.getScyName());
+        //统一社会信用代码
+        queryWrapper.eq(SysCompany::getScyRemarks,sysCompany.getScySocialCode());
+        List<SysCompany> list = sysCompanyService.findSysCompanys(queryWrapper);
+        //不重复则储存营业执照并上传
+        if(list.size() == 0){
+            sysCompanyService.createSysCompany(sysCompany);
+                //获取上传文件token
+                String token = SecurityUtils.getToken(ServletUtils.getRequest());
+                //文件传输
+                R<PubFileInf> fileResult = remoteFileService.uploadFile(file,"01","04","00", companyId, token);
+                sysCompany.setScyLicenseFile(fileResult.getData().getPfiFileId());
+        }else{
+//            zcInvoiceInf.setZiiId(list.get(0).getZiiId());
+        }
+        //返回发票信息
+        return sysCompany;
+    }
+    /**
+     * 法人身份证正面识别
+     *
+     * @param file    文件
+     * @return
+     */
+    @PostMapping("/getCardPositive")
+    public R getCardPositive(MultipartFile file) {
+        //获取登录用户
+        LoginUser user = tokenService.getLoginUser();
+        String companyId = user.getSysUser().getCompanyId();
+        //获取企业信息
+        SysCompany sysCompany = ownAuthService.getCardPositive(file);
+        LambdaQueryWrapper<SysCompany> queryWrapper = new LambdaQueryWrapper<>();
+        //企业名称
+        queryWrapper.eq(SysCompany::getScyName,sysCompany.getScyName());
+        //统一社会信用代码
+        queryWrapper.eq(SysCompany::getScyRemarks,sysCompany.getScySocialCode());
+        List<SysCompany> list = sysCompanyService.findSysCompanys(queryWrapper);
+        //不重复则储存营业执照并上传
+        if(list.size() == 0){
+            sysCompanyService.createSysCompany(sysCompany);
+            //获取上传文件token
+            String token = SecurityUtils.getToken(ServletUtils.getRequest());
+            //文件传输
+            R<PubFileInf> fileResult = remoteFileService.uploadFile(file,"01","04","00", companyId, token);
+            sysCompany.setScyLicenseFile(fileResult.getData().getPfiFileId());
+        }else{
+//            zcInvoiceInf.setZiiId(list.get(0).getZiiId());
+        }
+        //返回发票信息
+        return R.ok(sysCompany);
+    }
+
+    /**
+     * 绑定对公账户
+     *
+     * @param map    企业信息
+     * @return
+     */
+    @PostMapping("/account")
+    public R account(@RequestBody Map<String,Object> map) throws Exception {
+        //获取登录用户
+        LoginUser user = tokenService.getLoginUser();
+        //企业id
+        String scyId = CommonUtil.objToString(map.get("scyId"));
+        //开户名
+        String pbaiAccountName = CommonUtil.objToString(map.get("pbaiAccountName"));
+        //银行卡号
+        String pbaiBankaccountId = CommonUtil.objToString(map.get("pbaiBankaccountId"));
+        //所属银行
+        String pbaiBankName = CommonUtil.objToString(map.get("pbaiBankName"));
+        //备注
+        String zbiRemark = CommonUtil.objToString(map.get("zbiRemark"));
+        PayBankAccInf payBankAccInf = new PayBankAccInf();
+        String  pbiId  =  IdUtils.fastSimpleUUID();
+        payBankAccInf.setPbaiId(pbiId);
+        payBankAccInf.setPbaiCstno(scyId);
+        payBankAccInf.setPbaiAccountName(pbaiAccountName);
+        payBankAccInf.setPbaiBankaccountId(pbaiBankaccountId);
+        payBankAccInf.setPbaiBankName(pbaiBankName);
+        payBankAccInfService.createPayBankAccInf(payBankAccInf);
+        //查询银行行号
+        LambdaQueryWrapper<ZcCfcaBankInf> queryWrapper = new LambdaQueryWrapper<>();
+        //所属银行
+        queryWrapper.eq(ZcCfcaBankInf::getZcbiBankName,pbaiBankName);
+        List<ZcCfcaBankInf> list = zcCfcaBankInfService.findZcCfcaBankInfs(queryWrapper);
+        if(list.size()==0){
+            return R.fail("银行名称错误,请输入正确的银行名");
+        }
+        //企业打款申请
+        JSONObject operatorAuth = CfcaUtil.paymentApply(ISPRO, INSTITUTIONID, pbaiAccountName, pbaiBankaccountId,list.get(0).getZcbiBankNo(),zbiRemark);
+        System.out.print("绑定对公户返回结果==========>" + operatorAuth);
+        /*      operatorAuth.getJSONObject(WORDS_RESULT);*/
+        return R.ok();
+    }
+
+    /**
+     * 打款验证
+     *
+     * @param map    企业信息
+     * @return
+     */
+    @PostMapping("/payment")
+    public R payment(@RequestBody Map<String,Object> map) throws Exception {
+        //获取登录用户
+        LoginUser user = tokenService.getLoginUser();
+        //交易流水号
+        String originalTxSN = CommonUtil.objToString(map.get("originalTxSN"));
+        //金额(分)
+        String amount = CommonUtil.objToString(map.get("amount"));
+        //备注
+        String zbiRemark = CommonUtil.objToString(map.get("zbiRemark"));
+        //企业打款申请
+        JSONObject operatorAuth = CfcaUtil.paymentAuth(ISPRO, INSTITUTIONID, originalTxSN, amount, zbiRemark);
+        System.out.print("打款认证结果==========>" + operatorAuth);
+        /*      operatorAuth.getJSONObject(WORDS_RESULT);*/
+        return R.ok();
+    }
+    /**
+     * 发送短信验证码
+     *
+     * @param phone    手机号
+     * @return
+     */
+    @PostMapping("/send")
+    public R send(String phone) throws Exception {
+        //获取登录用户
+        LoginUser user = tokenService.getLoginUser();
+        //企业打款申请
+        JSONObject operatorAuth = CfcaUtil.sendSmsCode(ISPRO, INSTITUTIONID,null,phone,null);
+        System.out.print("发送短信验证码结果==========>" + operatorAuth);
+        /*      operatorAuth.getJSONObject(WORDS_RESULT);*/
+        return R.ok();
+    }
+
+    /**
+     * 短信验证
+     *
+     * @param phone    手机号
+     * @return
+     */
+    @PostMapping("/verification")
+    public R verification(String phone,String code) throws Exception {
+        //获取登录用户
+        LoginUser user = tokenService.getLoginUser();
+        //企业打款申请
+        JSONObject operatorAuth = CfcaUtil.checkSmsCode(ISPRO, INSTITUTIONID,code,phone,null);
+        System.out.print("短信验证码验证结果==========>" + operatorAuth);
+        /*      operatorAuth.getJSONObject(WORDS_RESULT);*/
+        return R.ok();
+    }
+}

tianhu-system/src/main/java/com/tianhu/system/companyAuth/mapper/OwnAuthMapper.java

@@ -0,0 +1,22 @@
+package com.tianhu.system.companyAuth.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.Map;
+
+@Mapper
+public interface OwnAuthMapper {
+
+
+    /**
+     * 往来账款查询
+     * @param page
+     * @param map
+     * @return
+     */
+    public IPage<Map> selectBillInfList(Page<Map> page, @Param("paramMap") Map map);
+
+}

tianhu-system/src/main/java/com/tianhu/system/companyAuth/service/IOwnAuthService.java

@@ -0,0 +1,35 @@
+package com.tianhu.system.companyAuth.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+import com.tianhu.system.domain.SysCompany;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+public interface IOwnAuthService {
+
+
+    /**
+     * 往来账款查询
+     * @param map
+     * @param request
+     * @return
+     */
+    public IPage<Map> selectBillInfList(Map map, QueryRequest request);
+
+    /**
+     * 获取营业执照信息
+     * @param file
+     * @return
+     */
+    public SysCompany businessLicense(MultipartFile file);
+
+    /**
+     * 获取身份证正面信息
+     * @param file
+     * @return
+     */
+    public SysCompany getCardPositive(MultipartFile file);
+
+}

tianhu-system/src/main/java/com/tianhu/system/companyAuth/service/impl/OwnAuthServiceImpl.java

@@ -0,0 +1,170 @@
+package com.tianhu.system.companyAuth.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.common.core.ocr.OcrUtil;
+import com.tianhu.common.core.utils.CommonUtil;
+import com.tianhu.common.redis.service.RedisService;
+import com.tianhu.system.companyAuth.mapper.OwnAuthMapper;
+import com.tianhu.system.companyAuth.service.IOwnAuthService;
+import com.tianhu.system.domain.SysCompany;
+import lombok.SneakyThrows;
+import lombok.SneakyThrows;
+import org.json.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.text.SimpleDateFormat;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+@Service
+public class OwnAuthServiceImpl implements IOwnAuthService {
+
+    /**
+     * OCR appKey
+     */
+    private static String APP_KEY = "1nmSLQ4nRzQZzEznE5lbk2ja";
+
+    /**
+     * OCR secretKey
+     */
+    private static String SECRET_KEY = "d2OwQSGI1NqFXiuWuulTuXFN1fyKkkDH";
+
+    /**
+     * OCR 返回结果key
+     */
+    private static String WORDS_RESULT = "words_result";
+
+    /**
+     * OCR 身份证正面
+     */
+    private static String FRONT = "front";
+
+    /**
+     * OCR文字识别token缓存时间
+     */
+    private static Long REDIS_TIMES = 2505600L;
+
+    /**
+     * redis缓存token的key
+     */
+    private static String OCR_TOKEN_KEY = "ocr_access_token";
+
+    /**
+     * 验证状态 0未验证1成功2失败
+     */
+    private static String CHECK_SUCCESS = "1";
+
+    /**
+     * 验证状态 0未验证1成功2失败
+     */
+    private static String CHECK_ERROR = "2";
+
+
+    @Autowired
+    private RedisService redisService;
+
+    @Autowired
+    private OwnAuthMapper ownAuthMapper;
+
+    /**
+     * 往来账款查询
+     *
+     * @return
+     */
+    @Override
+    public IPage<Map> selectBillInfList(Map map, QueryRequest request) {
+        Page page = new Page<>(request.getPageNum(), request.getPageSize());
+        return ownAuthMapper.selectBillInfList(page, map);
+    }
+
+    /**
+     * 获取发票信息
+     *
+     * @return
+     */
+    @SneakyThrows
+    @Override
+    public SysCompany businessLicense(MultipartFile file) {
+        //获取发票信息
+        JSONObject result = OcrUtil.vatInvoice(getToken(), file);
+        System.out.print("营业执照文字提取结果==========>" + result);
+        SysCompany sysCompany = new SysCompany();
+        //校验返回结果是否成功
+        if (result != null && result.getJSONObject(WORDS_RESULT) != null) {
+            JSONObject wordsResult = result.getJSONObject(WORDS_RESULT);
+            //单位名称
+            String scyName = wordsResult.getJSONObject("单位名称").getString("words");
+            sysCompany.setScyName(scyName);
+            //社会信用代码
+            String scySocialCode = wordsResult.getJSONObject("社会信用代码").getString("words");
+            sysCompany.setScySocialCode(scySocialCode);
+            //地址
+            String scyAddress = wordsResult.getJSONObject("地址").getString("words");
+            sysCompany.setScyAddress(scyAddress);
+            //法人
+            String scyLegal = wordsResult.getJSONObject("法人").getString("words");
+            sysCompany.setScyLegal(scyLegal);
+            //注册资本
+            String scyRegisteredCapital= wordsResult.getJSONObject("注册资本").getString("words");
+            sysCompany.setScyRegisteredCapital(scyRegisteredCapital);
+            //时间格式化
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日");
+            //成立日期
+            String scyStartTime = wordsResult.getJSONObject("成立日期").getString("words");
+            sysCompany.setScyStartTime(sdf.format(scyStartTime));
+            //有效期
+            String scyEndTime = wordsResult.getJSONObject("有效期").getString("words");
+            sysCompany.setScyEndTime(sdf.format(scyEndTime));
+        }
+        //返回获取文字后的营业执照信息
+        return sysCompany;
+    }
+
+
+    /**
+     * 获取身份证正面信息
+     *
+     * @return
+     */
+    @SneakyThrows
+    @Override
+    public SysCompany getCardPositive(MultipartFile file) {
+        //获取身份证信息
+        JSONObject result = OcrUtil.idcard(getToken(),file,FRONT);
+        System.out.print("身份证文字提取结果==========>" + result);
+        SysCompany sysCompany = new SysCompany();
+        //校验返回结果是否成功
+        if (result != null && result.getJSONObject(WORDS_RESULT) != null) {
+            JSONObject wordsResult = result.getJSONObject(WORDS_RESULT);
+            //公民身份号码
+            String scyName = wordsResult.getJSONObject("公民身份号码").getString("words");
+            sysCompany.setScyName(scyName);
+            //姓名
+            String scySocialCode = wordsResult.getJSONObject("姓名").getString("words");
+            sysCompany.setScySocialCode(scySocialCode);
+        }
+        //返回身份证信息
+        return sysCompany;
+    }
+    /**
+     * 获取授权token
+     *
+     * @return
+     */
+    private String getToken() {
+        //授权token
+        String accessToken = redisService.getCacheObject(OCR_TOKEN_KEY);
+        if (!CommonUtil.isEmpty(accessToken)) {
+            return accessToken;
+        }
+        //授权token
+        accessToken = OcrUtil.getAuth(APP_KEY, SECRET_KEY);
+        //缓存29天
+        redisService.setCacheObject(OCR_TOKEN_KEY, accessToken, REDIS_TIMES, TimeUnit.SECONDS);
+        return accessToken;
+    }
+}

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

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author cuixq
- * @since 2021-08-16
+ * @since 2021-08-23
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -50,6 +50,12 @@ public class SysCompany implements Serializable {
     private String scySocialCode;
 
     /**
+     * 注册资本
+     */
+    @TableField("scy_registered_capital")
+    private String scyRegisteredCapital;
+
+    /**
      * 证件注册日
      */
     @TableField("scy_start_time")
@@ -116,13 +122,43 @@ public class SysCompany implements Serializable {
     private String scyType;
 
     /**
+     * 所属行业
+     */
+    @TableField("scy_industry")
+    private String scyIndustry;
+
+    /**
+     * 企业规模
+     */
+    @TableField("scy_scale")
+    private String scyScale;
+
+    /**
+     * 机构性质
+     */
+    @TableField("scy_organization")
+    private String scyOrganization;
+
+    /**
+     * 客户经理
+     */
+    @TableField("scy_manager")
+    private String scyManager;
+
+    /**
      * 备注
      */
     @TableField("scy_remarks")
     private String scyRemarks;
 
     /**
-     * 状态 00:正常 01:停用 99:删除
+     * 四要素认证状态(00:未认证, 01:认证通过, 02:认证未通过, 03:人工审批通过, 04:人工审批不通过)
+     */
+    @TableField("scy_auth_status")
+    private String scyAuthStatus;
+
+    /**
+     * 状态(00:正常, 01:停用, 02:待四要素认证(认证中), 03:待对公户认证(认证中), 04:待实名审核(认证中), 99:删除)
      */
     @TableField("scy_status")
     private String scyStatus;

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

@@ -0,0 +1,46 @@
+package com.tianhu.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+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>
+ * CFCA银行表
+ * </p>
+ *
+ * @author cuixq
+ * @since 2021-08-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("zc_cfca_bank_inf")
+public class ZcCfcaBankInf implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId("zcbi_id")
+    private String zcbiId;
+
+    /**
+     * 行号
+     */
+    @TableField("zcbi_bank_no")
+    private String zcbiBankNo;
+
+    /**
+     * 银行名称
+     */
+    @TableField("zcbi_bank_name")
+    private String zcbiBankName;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.tianhu.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.tianhu.system.domain.ZcCfcaBankInf;
+
+/**
+ * <p>
+ * CFCA银行表 Mapper 接口
+ * </p>
+ *
+ * @author cuixq
+ * @since 2021-08-24
+ */
+public interface ZcCfcaBankInfMapper extends BaseMapper<ZcCfcaBankInf> {
+
+}

tianhu-system/src/main/java/com/tianhu/system/service/IZcCfcaBankInfService.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.ZcCfcaBankInf;
+
+import java.util.List;
+
+/**
+ * ClassName: IZcCfcaBankInfService<br>
+ * Description: ZcCfcaBankInfService接口 <br>
+ * Company: keao
+ *
+ * @author cuixq
+ * @version v1.0.0    2021-08-24  cuixq    由Generator自动创建
+ */
+public interface IZcCfcaBankInfService extends IService<ZcCfcaBankInf> {
+    /**
+     * 查询（分页）
+     *
+     * @param request QueryRequest
+     * @param wrapper LambdaQueryWrapper<ZcCfcaBankInf>
+     * @return IPage<ZcCfcaBankInf>
+     */
+    IPage<ZcCfcaBankInf> findZcCfcaBankInfs(QueryRequest request, LambdaQueryWrapper<ZcCfcaBankInf> wrapper);
+
+    /**
+     * 查询（所有）
+     *
+     * @param wrapper LambdaQueryWrapper<ZcCfcaBankInf>
+     * @return List<ZcCfcaBankInf>
+     */
+    List<ZcCfcaBankInf> findZcCfcaBankInfs(LambdaQueryWrapper<ZcCfcaBankInf> wrapper);
+
+    /**
+     * 新增
+     *
+     * @param zcCfcaBankInf zcCfcaBankInf
+     */
+    void createZcCfcaBankInf(ZcCfcaBankInf zcCfcaBankInf);
+
+    /**
+     * 修改
+     *
+     * @param zcCfcaBankInf zcCfcaBankInf
+     */
+    void updateZcCfcaBankInf(ZcCfcaBankInf zcCfcaBankInf);
+
+    /**
+     * 删除
+     *
+     * @param wrapper LambdaQueryWrapper<ZcCfcaBankInf>
+     */
+    void deleteZcCfcaBankInf(LambdaQueryWrapper<ZcCfcaBankInf> wrapper);
+}

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

@@ -0,0 +1,64 @@
+package com.tianhu.system.service.impl;
+
+import com.tianhu.system.domain.ZcCfcaBankInf;
+import com.tianhu.system.mapper.ZcCfcaBankInfMapper;
+import com.tianhu.system.service.IZcCfcaBankInfService;
+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: ZcCfcaBankInfServiceImpl<br>
+ * Description: IZcCfcaBankInfService实现 <br>
+ * Company: keao
+ *
+ * @author cuixq
+ * @version v1.0.0    2021-08-24  cuixq    由Generator自动创建
+ */
+@Service
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
+public class ZcCfcaBankInfServiceImpl extends ServiceImpl<ZcCfcaBankInfMapper, ZcCfcaBankInf> implements IZcCfcaBankInfService {
+
+    @Autowired
+    private ZcCfcaBankInfMapper zcCfcaBankInfMapper;
+
+    @Override
+    public IPage<ZcCfcaBankInf> findZcCfcaBankInfs(QueryRequest request, LambdaQueryWrapper<ZcCfcaBankInf> wrapper) {
+        Page<ZcCfcaBankInf> page = new Page<>(request.getPageNum(), request.getPageSize());
+        return this.page(page, wrapper);
+    }
+
+    @Override
+    public List<ZcCfcaBankInf> findZcCfcaBankInfs(LambdaQueryWrapper<ZcCfcaBankInf> wrapper) {
+		return this.list(wrapper);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void createZcCfcaBankInf(ZcCfcaBankInf zcCfcaBankInf) {
+        this.save(zcCfcaBankInf);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateZcCfcaBankInf(ZcCfcaBankInf zcCfcaBankInf) {
+        this.saveOrUpdate(zcCfcaBankInf);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteZcCfcaBankInf(LambdaQueryWrapper<ZcCfcaBankInf> wrapper) {
+	    this.remove(wrapper);
+	}
+}

tianhu-system/src/main/resources/mapper/auth/OwnAuthMapper.xml

@@ -0,0 +1,47 @@
+<?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.huyi.service.companyAuth.mapper.OwnAuthMapper">
+
+    <select id="selectBillInfList" parameterType="map" resultType="map">
+        SELECT
+            b.zbi_id		        'zbiId',
+            b.zbi_name		        'zbiName',
+            b.zbi_contract_no	    'zbiContractNo',
+            b.zbi_amount		    'zbiAmount',
+            b.zbi_date		        'zbiDate',
+            b.zbi_pay_date	        'zbiPayDate',
+            r.scy_name		        'payerName',
+            e.scy_name		        'payeeName'
+        FROM
+            zc_bill_inf b
+        LEFT JOIN sys_company r
+            ON r.scy_id = b.zbi_payer_id
+        LEFT JOIN sys_company e
+            ON e.scy_id = b.zbi_payee_id
+        WHERE 1 = 1
+            and (b.zbi_payer_id = #{paramMap.contractNo} or b.zbi_payee_id = #{paramMap.contractNo})
+        <if test="paramMap.contractNo != null  and paramMap.contractNo != ''">
+            and b.zbi_contract_no = #{paramMap.contractNo}
+        </if>
+
+        <if test="paramMap.name != null  and paramMap.name != ''">
+            and b.zbi_name like concat('%', #{paramMap.name}, '%')
+        </if>
+
+        <if test="paramMap.payerName != null  and paramMap.payerName != ''">
+            and r.scy_name like concat('%', #{paramMap.payerName}, '%')
+        </if>
+
+        <if test="paramMap.payeeName != null  and paramMap.payeeName != ''">
+            and e.scy_name like concat('%', #{paramMap.payeeName}, '%')
+        </if>
+        order by b.create_time desc
+
+    </select>
+
+
+
+
+</mapper>

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

@@ -8,6 +8,7 @@
         <result column="scy_license_file" property="scyLicenseFile" />
         <result column="scy_name" property="scyName" />
         <result column="scy_social_code" property="scySocialCode" />
+        <result column="scy_registered_capital" property="scyRegisteredCapital" />
         <result column="scy_start_time" property="scyStartTime" />
         <result column="scy_end_time" property="scyEndTime" />
         <result column="scy_address" property="scyAddress" />
@@ -19,7 +20,12 @@
         <result column="scy_commitment_file" property="scyCommitmentFile" />
         <result column="scy_appendix_file" property="scyAppendixFile" />
         <result column="scy_type" property="scyType" />
+        <result column="scy_industry" property="scyIndustry" />
+        <result column="scy_scale" property="scyScale" />
+        <result column="scy_organization" property="scyOrganization" />
+        <result column="scy_manager" property="scyManager" />
         <result column="scy_remarks" property="scyRemarks" />
+        <result column="scy_auth_status" property="scyAuthStatus" />
         <result column="scy_status" property="scyStatus" />
         <result column="create_by" property="createBy" />
         <result column="create_time" property="createTime" />

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

@@ -0,0 +1,12 @@
+<?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.ZcCfcaBankInfMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.tianhu.system.domain.ZcCfcaBankInf">
+        <id column="zcbi_id" property="zcbiId" />
+        <result column="zcbi_bank_no" property="zcbiBankNo" />
+        <result column="zcbi_bank_name" property="zcbiBankName" />
+    </resultMap>
+
+</mapper>