Merge remote-tracking branch 'origin/master'

sc-service/src/main/java/com/huyi/service/base/entity/SysUser.java

@@ -0,0 +1,144 @@
+package com.huyi.service.base.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+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 xuefy
+ * @since 2021-08-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_user")
+public class SysUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    @TableId(value = "user_id", type = IdType.AUTO)
+    private Long userId;
+
+    /**
+     * 用户账号(手机号)
+     */
+    @TableField("user_name")
+    private String userName;
+
+    /**
+     * 用户姓名
+     */
+    @TableField("nick_name")
+    private String nickName;
+
+    /**
+     * 用户类型（00系统用户）
+     */
+    @TableField("user_type")
+    private String userType;
+
+    /**
+     * 用户邮箱
+     */
+    @TableField("email")
+    private String email;
+
+    /**
+     * 用户性别（0男 1女 2未知）
+     */
+    @TableField("sex")
+    private String sex;
+
+    /**
+     * 头像地址
+     */
+    @TableField("avatar")
+    private String avatar;
+
+    /**
+     * 密码
+     */
+    @TableField("password")
+    private String password;
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    @TableField("status")
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableField("del_flag")
+    private String delFlag;
+
+    /**
+     * 最后登录IP
+     */
+    @TableField("login_ip")
+    private String loginIp;
+
+    /**
+     * 身份证号(经办人必需维护)
+     */
+    @TableField("id_card")
+    private String idCard;
+
+    /**
+     * 证件文件(pub_file_inf.pfi_file_id)
+     */
+    @TableField("id_card_file")
+    private String idCardFile;
+
+    /**
+     * 最后登录时间
+     */
+    @TableField("login_date")
+    private Date loginDate;
+
+    /**
+     * 创建者
+     */
+    @TableField("create_by")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField("update_by")
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+
+}

sc-service/src/main/java/com/huyi/service/base/entity/ZcFinanceInf.java

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author xuefy
- * @since 2021-08-18
+ * @since 2021-08-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -68,7 +68,7 @@ public class ZcFinanceInf implements Serializable {
     private String zfiProductId;
 
     /**
-     * 融信创建(0:供应商申请, 1:核心企业开立)
+     * 融信创建(0:供应商申请, 1:核心企业开立, 2:供应商开立)
      */
     @TableField("zfi_create_type")
     private String zfiCreateType;
@@ -80,6 +80,18 @@ public class ZcFinanceInf implements Serializable {
     private String zfiAmount;
 
     /**
+     * 收款账号
+     */
+    @TableField("zfi_collection_account")
+    private String zfiCollectionAccount;
+
+    /**
+     * 利率
+     */
+    @TableField("zfi_rate")
+    private String zfiRate;
+
+    /**
      * 签发有效期
      */
     @TableField("zfi_effective_date")
@@ -98,6 +110,24 @@ public class ZcFinanceInf implements Serializable {
     private Date zfiExpireDate;
 
     /**
+     * 平台审批状态
+     */
+    @TableField("zfi_platform_status")
+    private String zfiPlatformStatus;
+
+    /**
+     * 融资方审批状态
+     */
+    @TableField("zfi_supplier_status")
+    private String zfiSupplierStatus;
+
+    /**
+     * 核心企业融资状态
+     */
+    @TableField("zfi_core_status")
+    private String zfiCoreStatus;
+
+    /**
      * 状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资)
      */
     @TableField("zfi_status")

sc-service/src/main/java/com/huyi/service/base/mapper/SysUserMapper.java

@@ -0,0 +1,16 @@
+package com.huyi.service.base.mapper;
+
+import com.huyi.service.base.entity.SysUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用户信息表 Mapper 接口
+ * </p>
+ *
+ * @author xuefy
+ * @since 2021-08-23
+ */
+public interface SysUserMapper extends BaseMapper<SysUser> {
+
+}

sc-service/src/main/java/com/huyi/service/base/service/ISysUserService.java

@@ -0,0 +1,60 @@
+package com.huyi.service.base.service;
+
+import com.huyi.service.base.entity.SysUser;
+
+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: ISysUserService<br>
+ * Description: SysUserService接口 <br>
+ * Company: keao
+ *
+ * @author xuefy
+ * @version v1.0.0    2021-08-23  xuefy    由Generator自动创建
+ */
+public interface ISysUserService extends IService<SysUser> {
+    /**
+     * 查询（分页）
+     *
+     * @param request QueryRequest
+     * @param wrapper LambdaQueryWrapper<SysUser>
+     * @return IPage<SysUser>
+     */
+    IPage<SysUser> findSysUsers(QueryRequest request, LambdaQueryWrapper<SysUser> wrapper);
+
+    /**
+     * 查询（所有）
+     *
+     * @param wrapper LambdaQueryWrapper<SysUser>
+     * @return List<SysUser>
+     */
+    List<SysUser> findSysUsers(LambdaQueryWrapper<SysUser> wrapper);
+
+    /**
+     * 新增
+     *
+     * @param sysUser sysUser
+     */
+    void createSysUser(SysUser sysUser);
+
+    /**
+     * 修改
+     *
+     * @param sysUser sysUser
+     */
+    void updateSysUser(SysUser sysUser);
+
+    /**
+     * 删除
+     *
+     * @param wrapper LambdaQueryWrapper<SysUser>
+     */
+    void deleteSysUser(LambdaQueryWrapper<SysUser> wrapper);
+}

sc-service/src/main/java/com/huyi/service/base/service/impl/SysUserServiceImpl.java

@@ -0,0 +1,64 @@
+package com.huyi.service.base.service.impl;
+
+import com.huyi.service.base.entity.SysUser;
+import com.huyi.service.base.mapper.SysUserMapper;
+import com.huyi.service.base.service.ISysUserService;
+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: SysUserServiceImpl<br>
+ * Description: ISysUserService实现 <br>
+ * Company: keao
+ *
+ * @author xuefy
+ * @version v1.0.0    2021-08-23  xuefy    由Generator自动创建
+ */
+@Service
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
+public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
+
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
+    @Override
+    public IPage<SysUser> findSysUsers(QueryRequest request, LambdaQueryWrapper<SysUser> wrapper) {
+        Page<SysUser> page = new Page<>(request.getPageNum(), request.getPageSize());
+        return this.page(page, wrapper);
+    }
+
+    @Override
+    public List<SysUser> findSysUsers(LambdaQueryWrapper<SysUser> wrapper) {
+		return this.list(wrapper);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void createSysUser(SysUser sysUser) {
+        this.save(sysUser);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateSysUser(SysUser sysUser) {
+        this.saveOrUpdate(sysUser);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteSysUser(LambdaQueryWrapper<SysUser> wrapper) {
+	    this.remove(wrapper);
+	}
+}

sc-service/src/main/resources/mapper/base/SysUserMapper.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.huyi.service.base.mapper.SysUserMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huyi.service.base.entity.SysUser">
+        <id column="user_id" property="userId" />
+        <result column="user_name" property="userName" />
+        <result column="nick_name" property="nickName" />
+        <result column="user_type" property="userType" />
+        <result column="email" property="email" />
+        <result column="sex" property="sex" />
+        <result column="avatar" property="avatar" />
+        <result column="password" property="password" />
+        <result column="status" property="status" />
+        <result column="del_flag" property="delFlag" />
+        <result column="login_ip" property="loginIp" />
+        <result column="id_card" property="idCard" />
+        <result column="id_card_file" property="idCardFile" />
+        <result column="login_date" property="loginDate" />
+        <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="remark" property="remark" />
+    </resultMap>
+
+</mapper>

sc-service/src/main/resources/mapper/base/ZcFinanceInfMapper.xml

@@ -13,9 +13,14 @@
         <result column="zfi_product_id" property="zfiProductId" />
         <result column="zfi_create_type" property="zfiCreateType" />
         <result column="zfi_amount" property="zfiAmount" />
+        <result column="zfi_collection_account" property="zfiCollectionAccount" />
+        <result column="zfi_rate" property="zfiRate" />
         <result column="zfi_effective_date" property="zfiEffectiveDate" />
         <result column="zfi_sign_date" property="zfiSignDate" />
         <result column="zfi_expire_date" property="zfiExpireDate" />
+        <result column="zfi_platform_status" property="zfiPlatformStatus" />
+        <result column="zfi_supplier_status" property="zfiSupplierStatus" />
+        <result column="zfi_core_status" property="zfiCoreStatus" />
         <result column="zfi_status" property="zfiStatus" />
         <result column="zfi_profit_spare1" property="zfiProfitSpare1" />
         <result column="zfi_profit_spare2" property="zfiProfitSpare2" />

sc-service/src/main/resources/mapper/base/ZcFinanceSupplierQuotaMapper.xml

@@ -0,0 +1,34 @@
+<?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.base.mapper.ZcFinanceSupplierQuotaMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huyi.service.base.entity.ZcFinanceSupplierQuota">
+        <id column="zfsq_id" property="zfsqId" />
+        <result column="zfsq_core_quota_id" property="zfsqCoreQuotaId" />
+        <result column="zfsq_company_id" property="zfsqCompanyId" />
+        <result column="zfsq_amount" property="zfsqAmount" />
+        <result column="zfsq_old_amount" property="zfsqOldAmount" />
+        <result column="zfsq_rate" property="zfsqRate" />
+        <result column="zfsq_used_amount" property="zfsqUsedAmount" />
+        <result column="zfsq_available_amount" property="zfsqAvailableAmount" />
+        <result column="zfsq_date_type" property="zfsqDateType" />
+        <result column="zfsq_start_date" property="zfsqStartDate" />
+        <result column="zfsq_end_date" property="zfsqEndDate" />
+        <result column="zfsq_status" property="zfsqStatus" />
+        <result column="zfsq_profit_spare1" property="zfsqProfitSpare1" />
+        <result column="zfsq_profit_spare2" property="zfsqProfitSpare2" />
+        <result column="zfsq_profit_spare3" property="zfsqProfitSpare3" />
+        <result column="zfsq_profit_spare4" property="zfsqProfitSpare4" />
+        <result column="zfsq_profit_spare5" property="zfsqProfitSpare5" />
+        <result column="zfsq_profit_spare6" property="zfsqProfitSpare6" />
+        <result column="zfsq_profit_spare7" property="zfsqProfitSpare7" />
+        <result column="zfsq_profit_spare8" property="zfsqProfitSpare8" />
+        <result column="zfsq_profit_spare9" property="zfsqProfitSpare9" />
+        <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>